commit c209fb179969a2a44dc0071d506135b7ee178212
author Tobias Thierer <tobiast@google.com> Tue Mar 27 09:54:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 27 09:54:13 2018 +0000
tree ea05155c99ad420bbb04391122d2b4f49a3cbcc7
parent 1f7bf445e7857287c8c6e21d5078a1a112647fe6
parent e5665cdb4e6f4b3031718a9a8e49d67f68a51702

Merge "javadoc/droidoc: Don't add .jar files to sourcepath."

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index b174f31..77f1a50 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -216,7 +216,7 @@
                 $(PRIVATE_ADDITIONAL_HTML_DIR) \
                 $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \
                 $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
-                -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \
+                -sourcepath $(PRIVATE_SOURCE_PATH) \
                 -d $(PRIVATE_OUT_DIR) \
                 $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) \
                 $(PRIVATE_DROIDDOC_OPTIONS) \
@@ -261,7 +261,7 @@
                 $(PRIVATE_PROFILING_OPTIONS) \
                 $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
                 $(PRIVATE_BOOTCLASSPATH_ARG) \
-                -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \
+                -sourcepath $(PRIVATE_SOURCE_PATH) \
                 -d $(PRIVATE_OUT_DIR) \
                 -quiet \
         && touch -f $@ \