Merge "Modify build to put dumpcoverage agent into /system/lib"
am: 4d77e4da45
Change-Id: Ia1eb965b2179b26e31976676365fa059ee5ba4ec
This commit is contained in:
commit
8532af0f29
10
core/main.mk
10
core/main.mk
|
@ -343,6 +343,15 @@ ifneq (,$(filter debug,$(tags_to_install)))
|
||||||
endif
|
endif
|
||||||
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 ##
|
## sdk ##
|
||||||
|
|
||||||
ifdef is_sdk_build
|
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 debug,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG)) \
|
||||||
$(if $(filter tests,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_TESTS)) \
|
$(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 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) \
|
$(call auto-included-modules) \
|
||||||
) \
|
) \
|
||||||
$(eval ### Filter out the overridden packages and executables before doing expansion) \
|
$(eval ### Filter out the overridden packages and executables before doing expansion) \
|
||||||
|
|
|
@ -126,6 +126,8 @@ _product_list_vars += PRODUCT_HOST_PACKAGES
|
||||||
_product_list_vars += PRODUCT_PACKAGES
|
_product_list_vars += PRODUCT_PACKAGES
|
||||||
_product_list_vars += PRODUCT_PACKAGES_DEBUG
|
_product_list_vars += PRODUCT_PACKAGES_DEBUG
|
||||||
_product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN
|
_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_ENG
|
||||||
_product_list_vars += PRODUCT_PACKAGES_TESTS
|
_product_list_vars += PRODUCT_PACKAGES_TESTS
|
||||||
|
|
||||||
|
|
|
@ -376,6 +376,9 @@ PRODUCT_SYSTEM_SERVER_APPS += \
|
||||||
# Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
|
# Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
|
||||||
PRODUCT_PACKAGES_DEBUG_ASAN :=
|
PRODUCT_PACKAGES_DEBUG_ASAN :=
|
||||||
|
|
||||||
|
PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := \
|
||||||
|
libdumpcoverage
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
|
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
|
||||||
frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)
|
frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue