Merge "Copy additional test apk outputs to suite dirs."

This commit is contained in:
Treehugger Robot 2019-11-21 23:20:16 +00:00 committed by Gerrit Code Review
commit 4a0832210c
1 changed files with 10 additions and 0 deletions

View File

@ -104,6 +104,16 @@ ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)
$(my_all_targets): $(my_installed)
# Copy test suite files.
ifdef LOCAL_COMPATIBILITY_SUITE
my_apks_to_install := $(foreach f,$(filter %.apk,$(LOCAL_SOONG_BUILT_INSTALLED)),$(call word-colon,1,$(f)))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(foreach a,$(my_apks_to_install),\
$(call compat-copy-pair,$(a),$(dir)/$(notdir $(a)))))))
$(call create-suite-dependencies)
endif
# embedded JNI will already have been handled by soong
my_embed_jni :=
my_prebuilt_jni_libs :=