commit 4d77e4da4558e21eb0ed51f0c46709c16b3c1074
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 28 22:41:14 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 28 22:41:14 2019 +0000
tree bae6b4a314e3b889fc962137c93d4b62e0c0bd28
parent bf95d43dc688f5fda47855c2feba93da83f76464
parent 7185f8cc2d67f733acb3b597cab100edf8fd1499

Merge "Modify build to put dumpcoverage agent into /system/lib"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 73aa649..7ee63c6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -343,6 +343,15 @@
 endif
 endif
 
+## java coverage ##
+# Install additional tools on java coverage builds
+ifeq (true,$(EMMA_INSTRUMENT))
+ifneq (,$(filter debug,$(tags_to_install)))
+  tags_to_install += java_coverage
+endif
+endif
+
+
 ## sdk ##
 
 ifdef is_sdk_build
@@ -1140,6 +1149,7 @@
     $(if $(filter debug,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG)) \
     $(if $(filter tests,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_TESTS)) \
     $(if $(filter asan,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_ASAN)) \
+    $(if $(filter java_coverage,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE)) \
     $(call auto-included-modules) \
   ) \
   $(eval ### Filter out the overridden packages and executables before doing expansion) \

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 9ec3257..77b129d 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -126,6 +126,8 @@
 _product_list_vars += PRODUCT_PACKAGES
 _product_list_vars += PRODUCT_PACKAGES_DEBUG
 _product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN
+# Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true
+_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE
 _product_list_vars += PRODUCT_PACKAGES_ENG
 _product_list_vars += PRODUCT_PACKAGES_TESTS
 

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index e226260..162fbed 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -376,6 +376,9 @@
 # Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
 PRODUCT_PACKAGES_DEBUG_ASAN :=
 
+PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := \
+    libdumpcoverage
+
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
     frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)