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

Commit 5eac77c7 authored by Yo Chiang's avatar Yo Chiang
Browse files

Build rules use private vars 

Create PRIVATE_TOOLS_PREFIX for VNDK build rules. So that the value of
$(my_prefix) is well-preserved.

Bug: 142350531
Bug: 141971626
Test: lunch aosp_cf_x86_go_phone-userdebug ; m nothing
Change-Id: I06f16708c7165cb909f0031182ffb96a462d6000
parent 0d07c944

core/soong_cc_prebuilt.mk

+2 −1
Original line number Diff line number Diff line
@@ -120,11 +120,12 @@ ifeq ($(LOCAL_VNDK_DEPEND_ON_CORE_VARIANT),true) 
endif



ifeq ($(LOCAL_VNDK_DEPEND_ON_CORE_VARIANT),true)

$(LOCAL_BUILT_MODULE): PRIVATE_TOOLS_PREFIX := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)TOOLS_PREFIX)

$(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE) $(LIBRARY_IDENTITY_CHECK_SCRIPT)

	$(call verify-vndk-libs-identical,\

		$(PRIVATE_CORE_VARIANT),\

		$<,\

		$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)TOOLS_PREFIX))

		$(PRIVATE_TOOLS_PREFIX))

	$(copy-file-to-target)

else

$(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)