Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d77e4da authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents bf95d43d 7185f8cc

core/main.mk

+10 −0
Original line number Diff line number Diff line
@@ -343,6 +343,15 @@ ifneq (,$(filter debug,$(tags_to_install))) 
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 @@ define product-installed-files 
    $(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

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ _product_list_vars += PRODUCT_HOST_PACKAGES 
_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

+3 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ PRODUCT_SYSTEM_SERVER_APPS += \ 
# 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)