diff options
| author | Sandeep Chawla <sandeep@cyngn.com> | 2016-01-22 16:49:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-25 09:17:36 -0800 |
| commit | a3b29b6a943d1df96a7a4c41d0578b28253a9454 (patch) | |
| tree | 40fd3cd269b7011bc044481141f10a84cb078b64 /libs/androidfw/tests/Android.mk | |
| parent | 0f045bdd5e482270928393c2d620d0c15221a68e (diff) | |
| download | frameworks_base-a3b29b6a943d1df96a7a4c41d0578b28253a9454.zip frameworks_base-a3b29b6a943d1df96a7a4c41d0578b28253a9454.tar.gz frameworks_base-a3b29b6a943d1df96a7a4c41d0578b28253a9454.tar.bz2 | |
tests: Fix compilation issue for themes unit tests
- Revert header file for tests to AOSP
- Revert Android.mk to CM 12.1 version
Change-Id: Ie7ef8bad6ebe6579eb4350000af995f8b9f5964a
Diffstat (limited to 'libs/androidfw/tests/Android.mk')
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 2896af6..5fd17cc 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -35,15 +35,7 @@ testFiles := \ TypeWrappers_test.cpp \ ZipUtils_test.cpp -androidfw_test_cflags := \ - -Wall \ - -Werror \ - -Wunused \ - -Wunreachable-code \ - -Wno-missing-field-initializers \ -# gtest is broken. -androidfw_test_cflags += -Wno-unnamed-type-template-args # ========================================================== # Build the host tests: libandroidfw_tests @@ -51,7 +43,7 @@ androidfw_test_cflags += -Wno-unnamed-type-template-args include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests -LOCAL_CFLAGS := $(androidfw_test_cflags) + LOCAL_SRC_FILES := $(testFiles) LOCAL_STATIC_LIBRARIES := \ libandroidfw \ @@ -69,7 +61,6 @@ ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) LOCAL_MODULE := libandroidfw_tests -LOCAL_CFLAGS := $(androidfw_test_cflags) LOCAL_SRC_FILES := $(testFiles) \ BackupData_test.cpp \ ObbFile_test.cpp \ |