commit e2ff54f07c829f85d52876e182b027fa4b776e1c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 30 02:35:19 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 30 02:35:19 2020 +0000
tree 0e578a78de7e72d47a0efe0908f86a5934746e64
parent 9aa8dababd5aa833649e93b39cf92c7260cc2756
parent d71e6ef694c9458e5906043a0169c8ce650b87cc

Merge "RESTRICT AUTOMERGE: rvc-dev is BUILD_ID=RVC" into rvc-dev

core/soong_app_prebuilt.mk

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 0a5ba9d..a001e3a 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -202,4 +202,11 @@
   )
 endif
 
+ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
+  my_coverage_dir := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))
+  my_coverage_copy_pairs := $(foreach f,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(f):$(my_coverage_dir)/$(notdir  $(f)))
+  my_coverage_files := $(call copy-many-files,$(my_coverage_copy_pairs))
+  $(LOCAL_INSTALLED_MODULE): $(my_coverage_files)
+endif
+
 SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5ff92ac..a01133b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -27,6 +27,7 @@
     android.test.base \
     android.test.mock \
     android.test.runner \
+    ANGLE \
     apexd \
     appops \
     app_process \