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

Commit 1fa4c44c authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge changes from topic "system-api" 

am: 6e4e9f32

Change-Id: I95cf7c414dbd1f45fa87b1d50bf2fe97c7994178
parents f3e83020 6e4e9f32

core/droiddoc.mk

+7 −2
Original line number Diff line number Diff line
@@ -73,12 +73,17 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_test_stubs_current)

  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

      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

  endif

else

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

core/java_common.mk

+5 −1
Original line number Diff line number Diff line
@@ -230,10 +230,14 @@ ifndef LOCAL_IS_HOST_MODULE 
      full_java_bootclasspath_libs := $(call java-lib-header-files,android_test_stubs_current)

    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

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

      endif

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

  endif # LOCAL_SDK_VERSION