summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorChris Forbes <chrisforbes@google.com>2017-12-08 18:04:07 -0800
committerChris Forbes <chrisforbes@google.com>2017-12-08 18:04:07 -0800
commitbe9975ed53020fc2b89efeb5a1c1728b546a2b64 (patch)
tree49e76d032c88bc4193624abb4b92d29e1b16ed44 /Android.mk
parentd410e0b9152936b3f3a3f29c606aa2ce79b1007e (diff)
parent5afbb268c48682b098ed31426fdcfa95d246e136 (diff)
downloadVK-GL-CTS-be9975ed53020fc2b89efeb5a1c1728b546a2b64.tar.gz
VK-GL-CTS-be9975ed53020fc2b89efeb5a1c1728b546a2b64.tar.bz2
VK-GL-CTS-be9975ed53020fc2b89efeb5a1c1728b546a2b64.zip
Merge remote-tracking branch 'aosp/master' into deqp-dev
Conflicts: Android.mk android/cts/master/src/vk-excluded-tests.txt android/cts/master/vk-master.txt modules/glshared/glsBuiltinPrecisionTests.cpp Change-Id: Ic6d2f5de1465158d9f105f9648f117d7b2b915a6
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index d82732bea..6f6e7cc81 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,8 @@ deqp_compile_flags := \
-D_XOPEN_SOURCE=600 \
-DDEQP_TARGET_NAME=\"android\" \
-DQP_SUPPORT_PNG=1 \
+ -Wall \
+ -Werror \
-Wconversion \
-fwrapv \
-Wno-sign-conversion