Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f
am: 4d6f904a88
Change-Id: Ib0e503efca67d3abcb964c5c9cc6bf6c60d0a0fc
This commit is contained in:
@@ -21,7 +21,6 @@ include $(CLEAR_VARS)
|
|||||||
LOCAL_CFLAGS := -Werror
|
LOCAL_CFLAGS := -Werror
|
||||||
LOCAL_MODULE := recovery_unit_test
|
LOCAL_MODULE := recovery_unit_test
|
||||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libverifier \
|
libverifier \
|
||||||
libminui \
|
libminui \
|
||||||
@@ -46,10 +45,8 @@ include $(BUILD_NATIVE_TEST)
|
|||||||
|
|
||||||
# Manual tests
|
# Manual tests
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_CFLAGS := -Werror
|
LOCAL_CFLAGS := -Werror
|
||||||
LOCAL_MODULE := recovery_manual_test
|
LOCAL_MODULE := recovery_manual_test
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
libminui \
|
libminui \
|
||||||
libbase
|
libbase
|
||||||
@@ -86,7 +83,6 @@ LOCAL_CFLAGS := \
|
|||||||
-Werror \
|
-Werror \
|
||||||
-D_FILE_OFFSET_BITS=64
|
-D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
|
||||||
LOCAL_MODULE := recovery_component_test
|
LOCAL_MODULE := recovery_component_test
|
||||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||||
LOCAL_C_INCLUDES := bootable/recovery
|
LOCAL_C_INCLUDES := bootable/recovery
|
||||||
|
|||||||
Reference in New Issue
Block a user