aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-25 21:16:18 +0000
committerBob Badour <bbadour@google.com>2021-02-25 21:16:24 +0000
commite379d7450a51934b6709caabe0ce8dd2523b0f8f (patch)
tree221954a280fd9c8e68d92063c30440742f27a8e5
parent17c4d05d443adf0cd6c2714bf67f4c95ec53d933 (diff)
parent161a50ba48e44ce95c8d6e68b17896903bb2248c (diff)
downloadamber-e379d7450a51934b6709caabe0ce8dd2523b0f8f.tar.gz
resolve merge conflicts of 161a50ba48e44ce95c8d6e68b17896903bb2248c to sc-mainline-prod
Change-Id: I3ab76f02b6be2e766cc5a8c33f6ef38e13cbb321
-rw-r--r--Android.bp1
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index fa6af19..dfb1577 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,3 @@
-
genrule {
name: "deqp_amber_gen_vk_wrappers",
out: ["vk-wrappers.inc", "vk-wrappers.h"],