diff options
author | android-build-team Robot | 2017-10-13 03:03:11 -0500 |
---|---|---|
committer | android-build-team Robot | 2017-10-13 03:03:11 -0500 |
commit | 8b2aa4d81dd7d4813814fe0554b5ff17552d8bf1 (patch) | |
tree | 58d86b46a4e78e496f15979dcf5c0f66b21c8bd4 | |
parent | 5b7029ebbc5e24dc3523a5a9cd3b6ced5c62fe1b (diff) | |
parent | 47575b1f8afc73d939187d9ce848765c0cde98d5 (diff) | |
download | external-libgbm-8b2aa4d81dd7d4813814fe0554b5ff17552d8bf1.tar.gz external-libgbm-8b2aa4d81dd7d4813814fe0554b5ff17552d8bf1.tar.xz external-libgbm-8b2aa4d81dd7d4813814fe0554b5ff17552d8bf1.zip |
Snap for 4393550 from 47575b1f8afc73d939187d9ce848765c0cde98d5 to pi-release
Change-Id: If5fc5b271b1e1d0afedc858892195865f9da457a
-rw-r--r-- | Android.common.mk | 6 | ||||
-rw-r--r-- | Android.mk | 1 | ||||
-rw-r--r-- | rockchip/Android.mk | 3 | ||||
-rw-r--r-- | tegra/Android.mk | 3 | ||||
-rw-r--r-- | tests/planetest/Android.mk | 4 |
5 files changed, 15 insertions, 2 deletions
diff --git a/Android.common.mk b/Android.common.mk index 46370815..1fe79035 100644 --- a/Android.common.mk +++ b/Android.common.mk | |||
@@ -5,7 +5,13 @@ LOCAL_CFLAGS += \ | |||
5 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 5 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 |
6 | 6 | ||
7 | LOCAL_CFLAGS += \ | 7 | LOCAL_CFLAGS += \ |
8 | -Wall \ | ||
9 | -Werror \ | ||
10 | -Wno-format \ | ||
11 | -Wno-gnu-variable-sized-type-not-at-end \ | ||
12 | -Wno-pointer-arith \ | ||
8 | -Wno-unused-parameter \ | 13 | -Wno-unused-parameter \ |
14 | -Wno-unused-variable \ | ||
9 | -Wno-missing-field-initializers | 15 | -Wno-missing-field-initializers |
10 | 16 | ||
11 | # Quiet down the build system and remove any .h files from the sources | 17 | # Quiet down the build system and remove any .h files from the sources |
@@ -33,6 +33,7 @@ LOCAL_PATH := $(call my-dir) | |||
33 | include $(LOCAL_PATH)/Makefile.sources | 33 | include $(LOCAL_PATH)/Makefile.sources |
34 | 34 | ||
35 | common_CFLAGS := \ | 35 | common_CFLAGS := \ |
36 | -Wall -Werror \ | ||
36 | -Wno-enum-conversion \ | 37 | -Wno-enum-conversion \ |
37 | -Wno-pointer-arith \ | 38 | -Wno-pointer-arith \ |
38 | -Wno-sign-compare \ | 39 | -Wno-sign-compare \ |
diff --git a/rockchip/Android.mk b/rockchip/Android.mk index 6a2d3016..8f561cd9 100644 --- a/rockchip/Android.mk +++ b/rockchip/Android.mk | |||
@@ -8,7 +8,8 @@ LOCAL_SHARED_LIBRARIES := libdrm | |||
8 | LOCAL_SRC_FILES := rockchip_drm.c | 8 | LOCAL_SRC_FILES := rockchip_drm.c |
9 | 9 | ||
10 | LOCAL_CFLAGS := \ | 10 | LOCAL_CFLAGS := \ |
11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \ |
12 | -Wall -Werror | ||
12 | 13 | ||
13 | LOCAL_SHARED_LIBRARIES := \ | 14 | LOCAL_SHARED_LIBRARIES := \ |
14 | libdrm | 15 | libdrm |
diff --git a/tegra/Android.mk b/tegra/Android.mk index 861db348..cae4ff68 100644 --- a/tegra/Android.mk +++ b/tegra/Android.mk | |||
@@ -8,7 +8,8 @@ LOCAL_SHARED_LIBRARIES := libdrm | |||
8 | LOCAL_SRC_FILES := tegra.c | 8 | LOCAL_SRC_FILES := tegra.c |
9 | 9 | ||
10 | LOCAL_CFLAGS := \ | 10 | LOCAL_CFLAGS := \ |
11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 | 11 | -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \ |
12 | -Wall -Werror -Wno-unused-variable | ||
12 | 13 | ||
13 | LOCAL_SHARED_LIBRARIES := \ | 14 | LOCAL_SHARED_LIBRARIES := \ |
14 | libdrm | 15 | libdrm |
diff --git a/tests/planetest/Android.mk b/tests/planetest/Android.mk index 4c97e1e3..0c30968a 100644 --- a/tests/planetest/Android.mk +++ b/tests/planetest/Android.mk | |||
@@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) | |||
3 | include $(CLEAR_VARS) | 3 | include $(CLEAR_VARS) |
4 | include $(LOCAL_PATH)/Makefile.sources | 4 | include $(LOCAL_PATH)/Makefile.sources |
5 | 5 | ||
6 | LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith | ||
7 | |||
6 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES)) | 8 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES)) |
7 | 9 | ||
8 | LOCAL_MODULE := planetest | 10 | LOCAL_MODULE := planetest |
@@ -14,6 +16,8 @@ include $(BUILD_EXECUTABLE) | |||
14 | include $(CLEAR_VARS) | 16 | include $(CLEAR_VARS) |
15 | include $(LOCAL_PATH)/Makefile.sources | 17 | include $(LOCAL_PATH)/Makefile.sources |
16 | 18 | ||
19 | LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith | ||
20 | |||
17 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES)) | 21 | LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES)) |
18 | 22 | ||
19 | LOCAL_MODULE := atomictest | 23 | LOCAL_MODULE := atomictest |