tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Build rules use private vars"

Browse source 
am: 15b5ad2d05

Change-Id: I0ad9cefbfb0d975c6dae9c5a5fbbe1dcbc014785
This commit is contained in:
Alistair Delva 2019-10-28 21:14:25 -07:00 committed by android-build-merger
commit 4e6e02ac7b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/soong_cc_prebuilt.mk
View file

@ -120,11 +120,12 @@ ifeq ($(LOCAL_VNDK_DEPEND_ON_CORE_VARIANT),true)
endif endif
ifeq ($(LOCAL_VNDK_DEPEND_ON_CORE_VARIANT),true) 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) $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE) $(LIBRARY_IDENTITY_CHECK_SCRIPT)
$(call verify-vndk-libs-identical,\ $(call verify-vndk-libs-identical,\
$(PRIVATE_CORE_VARIANT),\ $(PRIVATE_CORE_VARIANT),\
$<,\ $<,\
$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)TOOLS_PREFIX)) $(PRIVATE_TOOLS_PREFIX))
$(copy-file-to-target) $(copy-file-to-target)
else else
$(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE) $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)