diff options
| author | Ying Wang <wangying@google.com> | 2010-06-23 20:59:22 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-06-23 20:59:22 -0700 |
| commit | 7b142da3ce3849e56134666566df3f04f033c57d (patch) | |
| tree | 4afa698c93c0b509c8d0d4d53be330085996263c /core/droiddoc.mk | |
| parent | aee4daacc804bbcd1df551cc2229d12fa5c35c24 (diff) | |
| download | build-7b142da3ce3849e56134666566df3f04f033c57d.zip build-7b142da3ce3849e56134666566df3f04f033c57d.tar.gz build-7b142da3ce3849e56134666566df3f04f033c57d.tar.bz2 | |
Fix javadoc for Java 6.
If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException
Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 03ffa55..0b8cd24 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -57,6 +57,12 @@ endif $(full_target): PRIVATE_CLASSPATH:=$(LOCAL_CLASSPATH) full_java_lib_deps := +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 + ifneq ($(LOCAL_IS_HOST_MODULE),true) ifeq ($(LOCAL_JAVA_LIBRARIES),) @@ -165,6 +171,7 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ -templatedir $(PRIVATE_TEMPLATE_DIR) \ $(PRIVATE_DROIDDOC_HTML_DIR) \ + $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -d $(PRIVATE_OUT_DIR) \ |