From 8bc6908feb810bf9702faef9b04898db9e679e0a Mon Sep 17 00:00:00 2001
From: Jaewoong Jung <jungjw@google.com>
Date: Thu, 21 Nov 2019 10:09:00 -0800
Subject: [PATCH] Copy additional test apk outputs to suite dirs.

Bug: 143902486
Test: m CtsIsolatedSplitApp
Change-Id: I13900ac2c8bb886987362dd380818ab5df2f23c6
---
 core/soong_app_prebuilt.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index c40271781..98c646a7e 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -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 :=