aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2017-10-13 03:03:11 -0500
committerandroid-build-team Robot2017-10-13 03:03:11 -0500
commit8b2aa4d81dd7d4813814fe0554b5ff17552d8bf1 (patch)
tree58d86b46a4e78e496f15979dcf5c0f66b21c8bd4
parent5b7029ebbc5e24dc3523a5a9cd3b6ced5c62fe1b (diff)
parent47575b1f8afc73d939187d9ce848765c0cde98d5 (diff)
downloadexternal-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.mk6
-rw-r--r--Android.mk1
-rw-r--r--rockchip/Android.mk3
-rw-r--r--tegra/Android.mk3
-rw-r--r--tests/planetest/Android.mk4
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
7LOCAL_CFLAGS += \ 7LOCAL_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
diff --git a/Android.mk b/Android.mk
index 501b12eb..2a980ad0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,6 +33,7 @@ LOCAL_PATH := $(call my-dir)
33include $(LOCAL_PATH)/Makefile.sources 33include $(LOCAL_PATH)/Makefile.sources
34 34
35common_CFLAGS := \ 35common_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
8LOCAL_SRC_FILES := rockchip_drm.c 8LOCAL_SRC_FILES := rockchip_drm.c
9 9
10LOCAL_CFLAGS := \ 10LOCAL_CFLAGS := \
11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \
12 -Wall -Werror
12 13
13LOCAL_SHARED_LIBRARIES := \ 14LOCAL_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
8LOCAL_SRC_FILES := tegra.c 8LOCAL_SRC_FILES := tegra.c
9 9
10LOCAL_CFLAGS := \ 10LOCAL_CFLAGS := \
11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 11 -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \
12 -Wall -Werror -Wno-unused-variable
12 13
13LOCAL_SHARED_LIBRARIES := \ 14LOCAL_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)
3include $(CLEAR_VARS) 3include $(CLEAR_VARS)
4include $(LOCAL_PATH)/Makefile.sources 4include $(LOCAL_PATH)/Makefile.sources
5 5
6LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith
7
6LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES)) 8LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(PLANETEST_FILES))
7 9
8LOCAL_MODULE := planetest 10LOCAL_MODULE := planetest
@@ -14,6 +16,8 @@ include $(BUILD_EXECUTABLE)
14include $(CLEAR_VARS) 16include $(CLEAR_VARS)
15include $(LOCAL_PATH)/Makefile.sources 17include $(LOCAL_PATH)/Makefile.sources
16 18
19LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-pointer-arith
20
17LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES)) 21LOCAL_SRC_FILES := $(filter-out %.h,$(PLANETEST_COMMON_FILES) $(ATOMICTEST_FILES))
18 22
19LOCAL_MODULE := atomictest 23LOCAL_MODULE := atomictest