p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES"

This commit is contained in:
Treehugger Robot 2018-02-14 18:27:08 +00:00 committed by Gerrit Code Review
parent 895a8172ee 889773f7ab
commit 9c339a76c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/droiddoc.mk
View File

@ -83,7 +83,11 @@ ifneq ($(LOCAL_SDK_VERSION),)
_version := _version :=
endif endif
else else
LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES) 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) $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-oj):$(call java-lib-files, core-libart)
endif # LOCAL_SDK_VERSION endif # LOCAL_SDK_VERSION
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))