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

Commit 910347f4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Modify build to put dumpcoverage agent into /system/lib am: 3ed9021f 

Change-Id: I4c3fa47783c2cb91ce5c76aeee244a52b880fdf1
parents 9c2650dc 3ed9021f

core/main.mk

+10 −0
Original line number Diff line number Diff line
@@ -345,6 +345,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
@@ -1139,6 +1148,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
@@ -119,6 +119,8 @@ _product_var_list += PRODUCT_HOST_PACKAGES 
_product_var_list += PRODUCT_PACKAGES

_product_var_list += PRODUCT_PACKAGES_DEBUG

_product_var_list += PRODUCT_PACKAGES_DEBUG_ASAN

# Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true

_product_var_list += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE

_product_var_list += PRODUCT_PACKAGES_ENG

_product_var_list += PRODUCT_PACKAGES_TESTS

target/product/base_system.mk

+3 −0
Original line number Diff line number Diff line
@@ -380,6 +380,9 @@ PRODUCT_PACKAGES_DEBUG_ASAN := \ 
    fuzz \

    honggfuzz



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)