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

am: 4a0832210c

Change-Id: I4b64fa007314398a9a8910ba0eb78668b784ab8a
This commit is contained in:
Jaewoong Jung 2019-11-21 15:26:21 -08:00 committed by android-build-merger
commit 18b0a0a072

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 :=