commit a4dce39c6e5e62bb9c8befedcd3441b6e3b7b832
author Alistair Delva <adelva@google.com> Mon Oct 28 21:35:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 21:35:34 2019 -0700
tree 3738e536efdc30328394dbfb2bdf320c2518a217
parent cad4596c2ffa6bf49d01e8f5522eec200d5ab527
parent 105510369c8e4919a557396cca1e9ba025154202

Merge "Build rules use private vars" am: 15b5ad2d05 am: 4e6e02ac7b am: c329243515
am: 105510369c

Change-Id: Ibe50e54a0388c6e0504d282423a5eec3e3806efd

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 9e3f0d3..20950ca 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -120,11 +120,12 @@
 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)