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

am: c209fb1799

Change-Id: Icdc8483e2f59bfec979b01b57a9770dc58c81929
This commit is contained in:
Tobias Thierer
2018-03-27 10:07:15 +00:00
committed by android-build-merger

View File

@@ -216,7 +216,7 @@ $(full_target): \
$(PRIVATE_ADDITIONAL_HTML_DIR) \ $(PRIVATE_ADDITIONAL_HTML_DIR) \
$(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \
$(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
-sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH) \
-d $(PRIVATE_OUT_DIR) \ -d $(PRIVATE_OUT_DIR) \
$(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) \ $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) \
$(PRIVATE_DROIDDOC_OPTIONS) \ $(PRIVATE_DROIDDOC_OPTIONS) \
@@ -261,7 +261,7 @@ $(full_target): $(full_src_files) $(LOCAL_GENERATED_SOURCES) $(full_java_libs) $
$(PRIVATE_PROFILING_OPTIONS) \ $(PRIVATE_PROFILING_OPTIONS) \
$(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
$(PRIVATE_BOOTCLASSPATH_ARG) \ $(PRIVATE_BOOTCLASSPATH_ARG) \
-sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH) \
-d $(PRIVATE_OUT_DIR) \ -d $(PRIVATE_OUT_DIR) \
-quiet \ -quiet \
&& touch -f $@ \ && touch -f $@ \