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

Commit 0c01c905 authored by Spandan Das's avatar Spandan Das
Browse files

Update hardcoded references to android_*stubs_current 

The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.

Test: TH
Test: No change in out/build-<lunch_product>.ninja

Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
parent d2b9ad4e

core/java_common.mk

+4 −4
Original line number 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.

      sdk_lib_suffix = $(call pretty-error,sdk_lib_suffix was not set correctly)

      ifeq (current,$(LOCAL_SDK_VERSION))

        sdk_module := android_stubs_current

        sdk_module := $(ANDROID_PUBLIC_STUBS)

        sdk_lib_suffix := .stubs

      else ifeq (system_current,$(LOCAL_SDK_VERSION))

        sdk_module := android_system_stubs_current

        sdk_module := $(ANDROID_SYSTEM_STUBS)

        sdk_lib_suffix := .stubs.system

      else ifeq (test_current,$(LOCAL_SDK_VERSION))

        sdk_module := android_test_stubs_current

        sdk_module := $(ANDROID_TEST_STUBS)

        sdk_lib_suffix := .stubs.test

      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)

      endif

      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name)$(sdk_lib_suffix))

core/main.mk

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



  # 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)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,android_module_lib_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,android_system_server_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_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)) $(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)) $(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):