commit 86487d68557865faae5c612512764b1fb3529b93
author Tao Bao <tbao@google.com> Wed Oct 26 00:02:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 26 00:02:08 2016 +0000
tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent 776651cc5b2d4db207139c27664e5a021b6c5273
parent ab526b124623052c6db1a5bcb02bca66e73509c4

Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db
am: ab526b1246

Change-Id: I5ce8de6c1bb15f30570428ee106b83356ef3bd90

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index abe6b6d..3d05386 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -84,13 +84,24 @@
     libtune2fs \
     $(tune2fs_static_libraries)
 
-testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/recovery
 testdata_files := $(call find-subdir-files, testdata/*)
 
+testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/recovery
 GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = cp $< $@
 $(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)/%
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN_2ND_ARCH)
+endif # TARGET_2ND_ARCH
+
 include $(BUILD_NATIVE_TEST)