diff options
| author | Ying Wang <wangying@google.com> | 2010-06-23 21:30:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 21:30:04 -0700 |
| commit | a52c4f31dc79f51553661e8ab1223b33236df963 (patch) | |
| tree | 1e0a6f930a706cfecdc30c978ffe4ba43b83f0d4 /core/droiddoc.mk | |
| parent | 74ba0c834fd203264c5968bfa8267b1888e1e562 (diff) | |
| parent | 48de6ce732a797f5c61186a3e57bec535e37d873 (diff) | |
| download | build-a52c4f31dc79f51553661e8ab1223b33236df963.zip build-a52c4f31dc79f51553661e8ab1223b33236df963.tar.gz build-a52c4f31dc79f51553661e8ab1223b33236df963.tar.bz2 | |
am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.
Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873'
* commit '48de6ce732a797f5c61186a3e57bec535e37d873':
Fix javadoc for Java 6.
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 e955a37..c523cb2 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) \ |