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

Commit 4d0b1c2c authored by Zach Riggle's avatar Zach Riggle Committed by android-build-merger
Browse files

Merge "Add PRODUCT_PACKAGES_DEBUG_ASAN" am: c22e207c am: ac6cd741 

am: 9358db72

Change-Id: I11d658243a92c228776162efa83965c1bebe4eb2
parents 1ee8faaf 9358db72

core/main.mk

+12 −0
Original line number Diff line number Diff line
@@ -321,6 +321,15 @@ ifndef is_sdk_build 
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 ##



ifdef is_sdk_build
@@ -934,6 +943,9 @@ tests_MODULES := $(sort \ 
        $(call get-tagged-modules,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

# and get rid of it from this list.

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ _product_var_list := \ 
    PRODUCT_AAPT_PREBUILT_DPI \

    PRODUCT_PACKAGES \

    PRODUCT_PACKAGES_DEBUG \

    PRODUCT_PACKAGES_DEBUG_ASAN \

    PRODUCT_PACKAGES_ENG \

    PRODUCT_PACKAGES_TESTS \

    PRODUCT_DEVICE \

target/product/base.mk

+3 −0
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ PRODUCT_PACKAGES_DEBUG := \ 
    sqlite3 \

    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,\

    frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)