summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-10-26 00:05:40 +0200
committerTao Bao <tbao@google.com>2016-10-26 00:12:13 +0200
commitf1338fbf4104f000e41b4f84f705db72096da324 (patch)
tree9f9691a161ac5e576f4efb255e9b35e47ea9f9da
parentMerge "applypatch: Fix the bug when constructing VAL_BLOB." (diff)
downloadandroid_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar.gz
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar.bz2
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar.lz
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar.xz
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.tar.zst
android_bootable_recovery-f1338fbf4104f000e41b4f84f705db72096da324.zip
-rw-r--r--tests/Android.mk13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index abe6b6d68..3d05386b0 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -84,13 +84,24 @@ LOCAL_STATIC_LIBRARIES := \
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)