commit 9c339a76c363073ec5f4a8c66daeeec1952baa5f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 14 18:27:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 14 18:27:08 2018 +0000
tree 9467e962d277c5222b129e5af5dabeb3f7a6ed22
parent 895a8172eec927ecfa7657c3021dbb7ad3f68d58
parent 889773f7abea722debe31413c102966e3e1bc893

Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES"

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 25b591c..8115481 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -83,7 +83,11 @@
     _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))