From e5665cdb4e6f4b3031718a9a8e49d67f68a51702 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Tue, 27 Mar 2018 00:15:50 +0100 Subject: [PATCH] javadoc/droidoc: Don't add .jar files to sourcepath. javadoc expects directories on the sourcepath, not jar files. The original commit 88b607994a148f4af5bffee163e39ce8296750c6 in 2009 was already passing the jar files, and every revision since then seems to have kept this habit through cargo cult. This CL removes the superfluous jar file arguments from the sourcepath argument to javadoc. Test: Treehugger Bug: 76436487 Change-Id: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845 --- core/droiddoc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/droiddoc.mk b/core/droiddoc.mk index b174f31a4a..77f1a50640 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -216,7 +216,7 @@ $(full_target): \ $(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 @@ $(full_target): $(full_src_files) $(LOCAL_GENERATED_SOURCES) $(full_java_libs) $ $(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 $@ \