diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-01 01:00:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-01 01:00:28 +0000 |
| commit | 2b7b307a4b948aa4346da6bb88b11c101c6686ba (patch) | |
| tree | 29fc985b2685e5fa06bebd8d4c4ff18f497025b1 | |
| parent | 68ca409c5cab7bd2c8766cfd9de867a52bf3c75e (diff) | |
| parent | 8b48f56e87a7ba9e002ba5c04f69965c7dcc4173 (diff) | |
| download | build-2b7b307a4b948aa4346da6bb88b11c101c6686ba.tar.gz | |
Merge "Install product shared libraries in /product/lib" into pi-dev
| -rw-r--r-- | core/envsetup.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 12b5869b12..700189e566 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 |