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

Commit b9a6afe0 authored Mar 23, 2023 by Spandan Das Committed by Automerger Merge Worker Mar 23, 2023

Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c

Original change: https://android-review.googlesource.com/c/platform/build/+/2498195

Change-Id: I875f2ea92b59216bc6ce67c5cd6ec339ccf86b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 45c93c3a 0326e64c

core/java_common.mk

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -296,16 +296,16 @@ ifndef LOCAL_IS_HOST_MODULE
	# Note: the lib naming scheme must be kept in sync with build/soong/java/sdk_library.go.		# Note: the lib naming scheme must be kept in sync with build/soong/java/sdk_library.go.
	sdk_lib_suffix = $(call pretty-error,sdk_lib_suffix was not set correctly)		sdk_lib_suffix = $(call pretty-error,sdk_lib_suffix was not set correctly)
	ifeq (current,$(LOCAL_SDK_VERSION))		ifeq (current,$(LOCAL_SDK_VERSION))
	sdk_module := android_stubs_current		sdk_module := $(ANDROID_PUBLIC_STUBS)
	sdk_lib_suffix := .stubs		sdk_lib_suffix := .stubs
	else ifeq (system_current,$(LOCAL_SDK_VERSION))		else ifeq (system_current,$(LOCAL_SDK_VERSION))
	sdk_module := android_system_stubs_current		sdk_module := $(ANDROID_SYSTEM_STUBS)
	sdk_lib_suffix := .stubs.system		sdk_lib_suffix := .stubs.system
	else ifeq (test_current,$(LOCAL_SDK_VERSION))		else ifeq (test_current,$(LOCAL_SDK_VERSION))
	sdk_module := android_test_stubs_current		sdk_module := $(ANDROID_TEST_STUBS)
	sdk_lib_suffix := .stubs.test		sdk_lib_suffix := .stubs.test
	else ifeq (core_current,$(LOCAL_SDK_VERSION))		else ifeq (core_current,$(LOCAL_SDK_VERSION))
	sdk_module := core.current.stubs		sdk_module := $(ANDROID_CORE_STUBS)
	sdk_lib_suffix = $(call pretty-error,LOCAL_SDK_LIBRARIES not supported for LOCAL_SDK_VERSION = core_current)		sdk_lib_suffix = $(call pretty-error,LOCAL_SDK_LIBRARIES not supported for LOCAL_SDK_VERSION = core_current)
	endif		endif
	sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name)$(sdk_lib_suffix))		sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name)$(sdk_lib_suffix))

core/main.mk

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1899,11 +1899,11 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE))
	endif		endif

	# Put XML formatted API files in the dist dir.		# Put XML formatted API files in the dist dir.
	$(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,android_stubs_current) $(APICHECK)		$(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,$(ANDROID_PUBLIC_STUBS)) $(APICHECK)
	$(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)		$(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,$(ANDROID_SYSTEM_STUBS)) $(APICHECK)
	$(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,android_module_lib_stubs_current) $(APICHECK)		$(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,$(ANDROID_MODULE_LIB_STUBS)) $(APICHECK)
	$(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,android_system_server_stubs_current) $(APICHECK)		$(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,$(ANDROID_SYSTEM_SERVER_STUBS)) $(APICHECK)
	$(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_stubs_current) $(APICHECK)		$(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,$(ANDROID_TEST_STUBS)) $(APICHECK)

	api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml)		api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml)
	$(api_xmls):		$(api_xmls):