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

Commit 9f14cf2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change the naming policy of system_$(VER)"

parents 67ba6002 7a02001f

core/droiddoc.mk

+6 −16
Original line number Diff line number Diff line
@@ -74,15 +74,6 @@ ifneq ($(LOCAL_SDK_VERSION),) 
  else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),core_current)

    LOCAL_JAVA_LIBRARIES := core.current.stubs $(LOCAL_JAVA_LIBRARIES)

    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core.current.stubs)

  else

    ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

      ifeq (,$(TARGET_BUILD_APPS))

        LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

      else

        LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

      endif

  else

    # core_<ver> is subset of <ver>. Instead of defining a prebuilt lib for core_<ver>,

    # use the stub for <ver> when building for apps.
@@ -91,7 +82,6 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(_version))

    _version :=

  endif

  endif

else

  LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES)

  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-oj):$(call java-lib-files, core-libart)

core/java_common.mk

+5 −13
Original line number Diff line number Diff line
@@ -260,20 +260,12 @@ ifndef LOCAL_IS_HOST_MODULE 
      full_java_bootclasspath_libs := $(call java-lib-header-files,android_test_stubs_current)

    else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),core_current)

      full_java_bootclasspath_libs := $(call java-lib-header-files,core.current.stubs)

    else

      ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

        ifeq (,$(TARGET_BUILD_APPS))

          full_java_bootclasspath_libs := $(call java-lib-header-files,system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

        else

          full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION))

        endif

    else

      # core_<ver> is subset of <ver>. Instead of defining a prebuilt lib for core_<ver>,

      # use the stub for <ver> when building for apps.

      _version := $(patsubst core_%,%,$(LOCAL_SDK_VERSION))

      full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(_version))

      _version :=

      endif

    endif # current, system_current, system_${VER}, test_current or core_current

  endif # LOCAL_SDK_VERSION