diff options
| author | Narayan Kamath <narayan@google.com> | 2013-10-25 15:55:46 +0100 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-04-07 15:08:18 -0700 |
| commit | f122d41b7511fd1b21162d1968a9aac5ff31a059 (patch) | |
| tree | e8f68535c7a0549c9f0b5a3978570b47295e3a3f | |
| parent | 260942fa826052f24455dbaf74e54189efb44e8b (diff) | |
| download | build-f122d41b7511fd1b21162d1968a9aac5ff31a059.tar.gz | |
Fix droiddoc generation.
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.
This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.
bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
| -rw-r--r-- | core/droiddoc.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index f528ee074e..41bd1d9f92 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -52,12 +52,7 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets endif -$(full_target): PRIVATE_BOOTCLASSPATH := -ifeq ($(BUILD_OS),linux) -# You have to set bootclasspath for javadoc manually on linux since Java 6. -host_jdk_rt_jar := $(dir $(HOST_JDK_TOOLS_JAR))../jre/lib/rt.jar -$(full_target): PRIVATE_BOOTCLASSPATH := $(host_jdk_rt_jar) -endif +$(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core) ifneq ($(LOCAL_IS_HOST_MODULE),true) @@ -202,6 +197,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) -J-Xmx1024m \ $(PRIVATE_PROFILING_OPTIONS) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ + $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -d $(PRIVATE_OUT_DIR) \ -quiet \ |