Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26246b3e authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

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

am: 3700f973

Change-Id: Ic0247fdeff0abe60696ed311f5bb8c1e79c2c603
parents c116988e 3700f973

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3652,7 +3652,7 @@ ifneq ($(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))

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.

	$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt

endif

core/install_jni_libs_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library) 


# Create symlink in the app specific lib path

# 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

# Add a shell command separator

LOCAL_POST_INSTALL_CMD += ;