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

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

Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES"

parents 895a8172 889773f7

core/droiddoc.mk

+5 −1
Original line number Diff line number Diff line
@@ -82,8 +82,12 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(_version))

    _version :=

  endif

else

  ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

    LOCAL_JAVA_LIBRARIES := core-oj core-libart

  else

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

  endif

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

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))