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

Commit 15b5ad2d authored by Alistair Delva's avatar Alistair Delva Committed by Gerrit Code Review
Browse files

Merge "Build rules use private vars"

parents 0fdd73b1 5eac77c7

core/soong_cc_prebuilt.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -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)