diff options
| author | 2014-11-07 15:03:46 -0800 | |
|---|---|---|
| committer | 2014-11-07 15:14:02 -0800 | |
| commit | dc9c109af815100d497184e6dadebceed7f3bf1d (patch) | |
| tree | 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37 /libs/androidfw/tests | |
| parent | 9a0aa553ad9f6657cbbf0a182566c481e191e6b7 (diff) | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
Diffstat (limited to 'libs/androidfw/tests')
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index d802a6b4d5a1..dd452009aa86 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -37,12 +37,17 @@ testFiles := \ include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests + +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +# gtest is broken. +LOCAL_CFLAGS += -Wno-unnamed-type-template-args + LOCAL_SRC_FILES := $(testFiles) LOCAL_STATIC_LIBRARIES := \ libandroidfw \ libutils \ libcutils \ - liblog + liblog include $(BUILD_HOST_NATIVE_TEST) @@ -54,6 +59,11 @@ ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests + +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +# gtest is broken. +LOCAL_CFLAGS += -Wno-unnamed-type-template-args + LOCAL_SRC_FILES := $(testFiles) \ BackupData_test.cpp \ ObbFile_test.cpp |