openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Build rules use private vars"

This commit is contained in:
Alistair Delva 2019-10-29 02:21:01 +00:00 committed by Gerrit Code Review
parent 0fdd73b18f 5eac77c735
commit 15b5ad2d05
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)