From 4938f3300a9389d33d0cf33a85d9f8fddbeeac3c Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 30 Nov 2016 15:38:31 -0800 Subject: [PATCH 1/2] Revert "Build: Add asanwrapper in SANITIZE_LITE" This reverts commit eee31511f70398ada44c7f8811234311ce8c7a7f. Rewriting of app_process adds an automatic dependency. Bug: 33224213 Test: m Change-Id: Idd9509d116692954224f4d2ffd6c81b69e9a85a3 --- target/product/base.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/product/base.mk b/target/product/base.mk index e0ceedc1b6..1909546c96 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -131,11 +131,6 @@ 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 \ From 88d43677f5f1f88e8a7969e990faf43bc364e46e Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 30 Nov 2016 15:38:43 -0800 Subject: [PATCH 2/2] Revert "Build: Add sanitized app_process" This reverts commit a35d92e4312b2247b0a27e17a6f08f82dae49fdf. The app_process__asan module is merged into app_process. Bug: 33224213 Test: m Change-Id: I5e3e836c67b5bd17cf967f1b2429e39c4e18557b --- target/product/base.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/target/product/base.mk b/target/product/base.mk index 1909546c96..2eb20aa391 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -129,13 +129,6 @@ 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