summaryrefslogtreecommitdiffstats
path: root/tests/Android.mk
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-08 20:48:07 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-11-08 20:48:07 +0100
commit5d5230348864049f0acc674840312ade5a690d96 (patch)
tree2c1d94b4d03408567cf27c8d72d31f059d2e8272 /tests/Android.mk
parentMerge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 (diff)
parentresolve merge conflicts of 70172d7 to stage-aosp-master (diff)
downloadandroid_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar.gz
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar.bz2
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar.lz
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar.xz
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.tar.zst
android_bootable_recovery-5d5230348864049f0acc674840312ade5a690d96.zip
Diffstat (limited to '')
-rw-r--r--tests/Android.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 8f19992b6..86591f71d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,6 @@ LOCAL_PATH := $(call my-dir)
# Unit tests
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_CFLAGS := -Werror
LOCAL_MODULE := recovery_unit_test
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@@ -32,17 +31,19 @@ LOCAL_STATIC_LIBRARIES := \
libselinux \
libbase
-LOCAL_SRC_FILES := unit/asn1_decoder_test.cpp
-LOCAL_SRC_FILES += unit/recovery_test.cpp
-LOCAL_SRC_FILES += unit/locale_test.cpp
-LOCAL_SRC_FILES += unit/zip_test.cpp
+LOCAL_SRC_FILES := \
+ unit/asn1_decoder_test.cpp \
+ unit/locale_test.cpp \
+ unit/recovery_test.cpp \
+ unit/sysutil_test.cpp \
+ unit/zip_test.cpp
+
LOCAL_C_INCLUDES := bootable/recovery
LOCAL_SHARED_LIBRARIES := liblog
include $(BUILD_NATIVE_TEST)
# Component tests
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_CFLAGS := -Werror
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE := recovery_component_test