p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN"

This commit is contained in:
Treehugger Robot 2018-04-02 21:15:59 +00:00 committed by Gerrit Code Review
parent 802eecc01c 9323b7faf3
commit c22e207c50
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@ -319,6 +319,15 @@ ifndef is_sdk_build
endif endif
endif endif
## asan ##
# Install some additional tools on ASAN builds IFF we are also installing debug tools
ifneq ($(filter address,$(SANITIZE_TARGET)),)
ifneq (,$(filter debug,$(tags_to_install)))
tags_to_install += asan
endif
endif
## sdk ## ## sdk ##
ifdef is_sdk_build ifdef is_sdk_build
@ -932,6 +941,9 @@ tests_MODULES := $(sort \
$(call get-tagged-modules,tests) \ $(call get-tagged-modules,tests) \
$(call module-installed-files, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_TESTS)) \ $(call module-installed-files, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_TESTS)) \
) )
asan_MODULES := $(sort \
$(call module-installed-files, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG_ASAN)) \
)
# TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES # TODO: Remove the 3 places in the tree that use ALL_DEFAULT_INSTALLED_MODULES
# and get rid of it from this list. # and get rid of it from this list.

1
core/product.mk
View File

@ -81,6 +81,7 @@ _product_var_list := \
PRODUCT_AAPT_PREBUILT_DPI \ PRODUCT_AAPT_PREBUILT_DPI \
PRODUCT_PACKAGES \ PRODUCT_PACKAGES \
PRODUCT_PACKAGES_DEBUG \ PRODUCT_PACKAGES_DEBUG \
PRODUCT_PACKAGES_DEBUG_ASAN \
PRODUCT_PACKAGES_ENG \ PRODUCT_PACKAGES_ENG \
PRODUCT_PACKAGES_TESTS \ PRODUCT_PACKAGES_TESTS \
PRODUCT_DEVICE \ PRODUCT_DEVICE \

3
target/product/base.mk
View File

@ -156,6 +156,9 @@ PRODUCT_PACKAGES_DEBUG := \
sqlite3 \ sqlite3 \
strace strace
# Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
PRODUCT_PACKAGES_DEBUG_ASAN :=
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)