summaryrefslogtreecommitdiffstats
path: root/tests/Android.mk
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-03 00:17:17 +0100
committerTao Bao <tbao@google.com>2016-11-03 07:18:01 +0100
commit4102b281324eca22cd4ef0922a79949ec6cf846e (patch)
treedf496b1d676e1c2e265abbc5777ecba1eb3afddd /tests/Android.mk
parentMerge "applypatch: Add testcases for applypatch executable." (diff)
downloadandroid_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar.gz
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar.bz2
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar.lz
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar.xz
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.tar.zst
android_bootable_recovery-4102b281324eca22cd4ef0922a79949ec6cf846e.zip
Diffstat (limited to '')
-rw-r--r--tests/Android.mk21
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 461d6ef76..8f19992b6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -87,7 +87,8 @@ LOCAL_STATIC_LIBRARIES := \
testdata_files := $(call find-subdir-files, testdata/*)
-testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/recovery
+# The testdata files that will go to $OUT/data/nativetest/recovery.
+testdata_out_path := $(TARGET_OUT_DATA)/nativetest/recovery
GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
@@ -95,14 +96,16 @@ $(GEN): $(testdata_out_path)/% : $(LOCAL_PATH)/%
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
-ifdef TARGET_2ND_ARCH
-testdata_out_path_2nd_arch := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/recovery
-GEN_2ND_ARCH := $(addprefix $(testdata_out_path_2nd_arch)/, $(testdata_files))
-$(GEN_2ND_ARCH): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN_2ND_ARCH): PRIVATE_CUSTOM_TOOL = cp $< $@
-$(GEN_2ND_ARCH): $(testdata_out_path_2nd_arch)/% : $(LOCAL_PATH)/%
+# A copy of the testdata to be packed into continuous_native_tests.zip.
+testdata_continuous_zip_prefix := \
+ $(call intermediates-dir-for,PACKAGING,recovery_component_test)/DATA
+testdata_continuous_zip_path := $(testdata_continuous_zip_prefix)/nativetest/recovery
+GEN := $(addprefix $(testdata_continuous_zip_path)/, $(testdata_files))
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
+$(GEN): $(testdata_continuous_zip_path)/% : $(LOCAL_PATH)/%
$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN_2ND_ARCH)
-endif # TARGET_2ND_ARCH
+LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_PICKUP_FILES := $(testdata_continuous_zip_prefix)
include $(BUILD_NATIVE_TEST)