From 8b48f56e87a7ba9e002ba5c04f69965c7dcc4173 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 4 May 2018 11:20:43 +0900 Subject: [PATCH] Install product shared libraries in /product/lib This is to support /product/lib. Shared libraries with LOCAL_PRODUCT_MODULE := true or product_specific: true has been installed in /system/lib. They are now installed in /product/lib. Bug: 73095206 Test: build succeeded && product libraries are installed under /product/lib Change-Id: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498 Merged-In: Ic49a0a3e1e47666c4d15189ab6fded8007ecb498 (cherry picked from commit 47c13524aae832c3d8b8955cccfb82a909f6a780) --- core/envsetup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 12b5869b1..700189e56 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -663,7 +663,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS) 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/. @@ -672,7 +672,7 @@ else 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