aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2016-09-24 11:48:32 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2016-09-24 11:48:32 +0800
commitb8f6af6c839278beee71381f45b2ebb88cfe708e (patch)
treeeb4a555af031357bfb3e9e58c91416a46a53fa39
parenta19e0b5148c219dbd1a3661719b96a1861c54b86 (diff)
downloadpiglit-b8f6af6c839278beee71381f45b2ebb88cfe708e.tar.gz
tests/util/Android.mk: update for nougat compilation
Change-Id: I383559fbdcbf301188716123dbe484bff8de6d4c Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--.gitreview5
-rw-r--r--tests/util/Android.mk4
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000000000..5981798a5
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=android-review.linaro.org
+port=29418
+project=platform/external/piglit
+defaultbranch=linaro-nougat
diff --git a/tests/util/Android.mk b/tests/util/Android.mk
index f13c8e95a..92a218490 100644
--- a/tests/util/Android.mk
+++ b/tests/util/Android.mk
@@ -60,12 +60,12 @@ LOCAL_GENERATED_SOURCES += $(CONFIG_HEADER)
intermediates:= $(local-generated-sources-dir)
GEN_PIGLIT_DISPATCH_DIR := $(LOCAL_PATH)
-GEN_DISPATCH := $(GEN_PIGLIT_DISPATCH_DIR)/%.h $(GEN_PIGLIT_DISPATCH_DIR)/%.c
+GEN_DISPATCH := $(filter $(CONFIG_HEADER), $(GEN_PIGLIT_DISPATCH_DIR)/%.h) $(GEN_PIGLIT_DISPATCH_DIR)/%.c
GEN_HEADER := $(GEN_PIGLIT_DISPATCH_DIR)/%.h
$(GEN_DISPATCH): PRIVATE_CUSTOM_TOOL = python $+ --out-dir $(GEN_PIGLIT_DISPATCH_DIR)
$(GEN_DISPATCH): $(LOCAL_PATH)/gen_dispatch.py
$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN_HEADER)
+LOCAL_GENERATED_SOURCES += $(filter, $(CONFIG_HEADER), $(GEN_HEADER))
LOCAL_SRC_FILES := \
fdo-bitmap.c \