StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Limit 2 uses of SANITIZE_TARGET to ASan." am: ffaf4815fc

Browse Source 
am: 3700f97331

Change-Id: Ic0247fdeff0abe60696ed311f5bb8c1e79c2c603
This commit is contained in:
Evgenii Stepanov
2019-01-18 17:47:15 -08:00
committed by android-build-merger
parent c116988ed1 3700f97331
commit 26246b3ee1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -3652,7 +3652,7 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH),)
$(hide) cp $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH) \ $(hide) cp $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH) \
$(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH)) $(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH))
endif endif
ifneq ($(strip $(SANITIZE_TARGET)),) ifneq (,$(filter address, $(SANITIZE_TARGET)))
# We need to create userdata.img with real data because the instrumented libraries are in userdata.img. # We need to create userdata.img with real data because the instrumented libraries are in userdata.img.
$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt $(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt
endif endif

2
core/install_jni_libs_internal.mk
View File

@@ -57,7 +57,7 @@ ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)
# Create symlink in the app specific lib path # Create symlink in the app specific lib path
# Skip creating this symlink when running the second part of a target sanitization build. # Skip creating this symlink when running the second part of a target sanitization build.
ifndef SANITIZE_TARGET ifeq ($(filter address,$(SANITIZE_TARGET)),)
ifdef LOCAL_POST_INSTALL_CMD ifdef LOCAL_POST_INSTALL_CMD
# Add a shell command separator # Add a shell command separator
LOCAL_POST_INSTALL_CMD += ; LOCAL_POST_INSTALL_CMD += ;