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

Commit b55bb77e authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 1b08226a: Merge "Different bootclasspath for droiddoc." 

* commit '1b08226a':
  Different bootclasspath for droiddoc.
parents 90219d98 1b08226a

core/droiddoc.mk

+6 −4
Original line number Diff line number Diff line
@@ -51,20 +51,22 @@ ifeq ($(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR),) 
LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets

endif





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



ifneq ($(LOCAL_IS_HOST_MODULE),true)

ifeq ($(LOCAL_IS_HOST_MODULE),true)

$(full_target): PRIVATE_BOOTCLASSPATH :=

else



ifneq ($(LOCAL_SDK_VERSION),)

  ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

    # Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

    LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)

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

  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 := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES)

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

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))