diff options
author | Alain Vongsouvanh <alainv@google.com> | 2018-04-02 11:50:08 -0700 |
---|---|---|
committer | Alain Vongsouvanh <alainv@google.com> | 2018-04-02 11:50:08 -0700 |
commit | 206c5eab8422d08b8cb80ee1d1e25cc4a3a8e050 (patch) | |
tree | 5d58c04b7c479766dbd3f5448c688a6916edc7a7 /msm8909w_3100 | |
parent | 2c364cfe21b36dc597d4cf378bc05e1265eda0f3 (diff) | |
download | gps-206c5eab8422d08b8cb80ee1d1e25cc4a3a8e050.tar.gz |
Add -Wno-error to compile with global -Werror.
This is inspired by commit 8dd51a02131983768f5c9e416e34c28d1ae6dcbc.
Bug: 77278270
Test: normal builds.
Change-Id: Ib3e60bb8e4bc5e17a556bae6fe5b0ae8b8d8c548
Diffstat (limited to 'msm8909w_3100')
-rw-r--r-- | msm8909w_3100/android/Android.mk | 6 | ||||
-rw-r--r-- | msm8909w_3100/core/Android.mk | 3 | ||||
-rw-r--r-- | msm8909w_3100/gnss/Android.mk | 1 | ||||
-rw-r--r-- | msm8909w_3100/location/Android.mk | 3 | ||||
-rw-r--r-- | msm8909w_3100/utils/Android.mk | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/msm8909w_3100/android/Android.mk b/msm8909w_3100/android/Android.mk index 03ea1f3..49c40ed 100644 --- a/msm8909w_3100/android/Android.mk +++ b/msm8909w_3100/android/Android.mk @@ -46,7 +46,8 @@ LOCAL_SHARED_LIBRARIES += \ libloc_pla \ liblocation_api \ -LOCAL_CFLAGS += $(GNSS_CFLAGS) +LOCAL_CFLAGS += $(GNSS_CFLAGS) \ + -Wno-error include $(BUILD_SHARED_LIBRARY) BUILD_GNSS_HIDL_SERVICE := true @@ -87,6 +88,7 @@ LOCAL_SHARED_LIBRARIES += \ libhidltransport \ android.hardware.gnss@1.0 \ -LOCAL_CFLAGS += $(GNSS_CFLAGS) +LOCAL_CFLAGS += $(GNSS_CFLAGS) \ + -Wno-error include $(BUILD_EXECUTABLE) endif # BUILD_GNSS_HIDL_SERVICE diff --git a/msm8909w_3100/core/Android.mk b/msm8909w_3100/core/Android.mk index dba0b0a..67318da 100644 --- a/msm8909w_3100/core/Android.mk +++ b/msm8909w_3100/core/Android.mk @@ -40,7 +40,8 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += \ -fno-short-enums \ - -D_ANDROID_ + -D_ANDROID_ \ + -Wno-error \ LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/data-items \ diff --git a/msm8909w_3100/gnss/Android.mk b/msm8909w_3100/gnss/Android.mk index 4d738bd..a74085b 100644 --- a/msm8909w_3100/gnss/Android.mk +++ b/msm8909w_3100/gnss/Android.mk @@ -26,6 +26,7 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += \ -fno-short-enums \ + -Wno-error \ ifeq ($(TARGET_BUILD_VARIANT),user) LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER diff --git a/msm8909w_3100/location/Android.mk b/msm8909w_3100/location/Android.mk index 6ac8e36..199c247 100644 --- a/msm8909w_3100/location/Android.mk +++ b/msm8909w_3100/location/Android.mk @@ -22,7 +22,8 @@ LOCAL_SRC_FILES += \ LocationAPIClientBase.cpp LOCAL_CFLAGS += \ - -fno-short-enums + -fno-short-enums \ + -Wno-error \ LOCAL_HEADER_LIBRARIES := \ libloc_pla_headers \ diff --git a/msm8909w_3100/utils/Android.mk b/msm8909w_3100/utils/Android.mk index 3f3b83a..637f154 100644 --- a/msm8909w_3100/utils/Android.mk +++ b/msm8909w_3100/utils/Android.mk @@ -31,7 +31,8 @@ LOCAL_SRC_FILES += \ # Flag -std=c++11 is not accepted by compiler when LOCAL_CLANG is set to true LOCAL_CFLAGS += \ -fno-short-enums \ - -D_ANDROID_ + -D_ANDROID_ \ + -Wno-error \ ifeq ($(TARGET_BUILD_VARIANT),user) LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER |