From a35d92e4312b2247b0a27e17a6f08f82dae49fdf Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 29 Nov 2016 19:22:01 -0800 Subject: [PATCH 1/2] Build: Add sanitized app_process Add sanitized app_process module to PRODUCT_PACKAGES when building with SANITIZE_LITE=true Bug: 33224213 Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asan Change-Id: Ic67976f1b897b638d569ec6f42d5a8d59f8a9285 --- target/product/base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/product/base.mk b/target/product/base.mk index 2eb20aa391..1909546c96 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -129,6 +129,13 @@ PRODUCT_PACKAGES += \ vold \ wm +# In SANITIZE_LITE, we have a specialized modules that are sanitized. +ifeq ($(SANITIZE_LITE),true) +PRODUCT_PACKAGES += \ + app_process__asan \ + +endif + # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ perfprofd From eee31511f70398ada44c7f8811234311ce8c7a7f Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 30 Nov 2016 10:20:20 -0800 Subject: [PATCH 2/2] Build: Add asanwrapper in SANITIZE_LITE Add asanwrapper helper binary to PRODUCT_PACKAGES when building with SANITIZE_LITE=true. Bug: 33224213 Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asanwrapper Change-Id: Ic4d8973b9e9ddfd9ef8663735bf5f70d8f9f70e1 --- target/product/base.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/base.mk b/target/product/base.mk index 1909546c96..e0ceedc1b6 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -131,6 +131,11 @@ PRODUCT_PACKAGES += \ # In SANITIZE_LITE, we have a specialized modules that are sanitized. ifeq ($(SANITIZE_LITE),true) +# Pull in the asan wrapper binary. +PRODUCT_PACKAGES += \ + asanwrapper \ + +# Pull in the specialized binaries. PRODUCT_PACKAGES += \ app_process__asan \