From 5eac77c73505689966553614a0fbba93d5d78ec7 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Fri, 25 Oct 2019 21:40:20 +0800 Subject: [PATCH] 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 --- core/soong_cc_prebuilt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 9e3f0d3a17..20950ca21e 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -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)