commit e56adeffefbf7b61f7adc8642fd77d9c91c46972
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 24 03:04:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 24 03:04:48 2018 +0000
tree 95204f76a7039fc74454c592898314c9ba13e737
parent bd842d0b6491bd5194e78fe16fdc03bccd599082
parent 47c13524aae832c3d8b8955cccfb82a909f6a780

Merge "Install product shared libraries in /product/lib"

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 1a36703..dc4bc3b 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -671,7 +671,7 @@
 
 TARGET_OUT_PRODUCT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT)
 ifneq ($(filter address,$(SANITIZE_TARGET)),)
-target_out_product_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/system
+target_out_product_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/product
 ifeq ($(SANITIZE_LITE),true)
 # When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not
 # work with unsanitized app_process. For simplicity, generate APKs into /data/asan/.
@@ -680,7 +680,7 @@
 target_out_product_app_base := $(TARGET_OUT_PRODUCT)
 endif
 else
-target_out_product_shared_libraries_base := $(TARGET_OUT)
+target_out_product_shared_libraries_base := $(TARGET_OUT_PRODUCT)
 target_out_product_app_base := $(TARGET_OUT_PRODUCT)
 endif