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

Commit 4e6e02ac authored by Alistair Delva's avatar Alistair Delva Committed by android-build-merger
Browse files

Merge "Build rules use private vars" 

am: 15b5ad2d

Change-Id: I0ad9cefbfb0d975c6dae9c5a5fbbe1dcbc014785
parents dd8414a5 15b5ad2d

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)