Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" am: 9c339a76c3
am: fb3d065f9a
Change-Id: If8559190f1c0e4b25656bda07fdedfbd5c9b82f8
This commit is contained in:
commit
a8b46cb432
|
@ -83,7 +83,11 @@ ifneq ($(LOCAL_SDK_VERSION),)
|
|||
_version :=
|
||||
endif
|
||||
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)
|
||||
endif # LOCAL_SDK_VERSION
|
||||
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
|
||||
|
|
Loading…
Reference in New Issue