diff options
author | Ying Wang <wangying@google.com> | 2010-06-24 11:59:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 11:59:09 -0700 |
commit | 572d63052dcc0238749b7c6a67a02a7e50d58495 (patch) | |
tree | dff3c08e81ae799e8daaef4ee05290adfe681452 /core/droiddoc.mk | |
parent | 5f9168c0d56d0c20da91f06d1078a1a47f1b547a (diff) | |
parent | 8b4be231519376c9dc73622be4b8a5ddc0d83805 (diff) | |
download | build-572d63052dcc0238749b7c6a67a02a7e50d58495.zip build-572d63052dcc0238749b7c6a67a02a7e50d58495.tar.gz build-572d63052dcc0238749b7c6a67a02a7e50d58495.tar.bz2 |
am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805'
* commit '8b4be231519376c9dc73622be4b8a5ddc0d83805':
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Diffstat (limited to 'core/droiddoc.mk')
-rw-r--r-- | core/droiddoc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index c523cb2..8495e6e 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -57,6 +57,7 @@ endif $(full_target): PRIVATE_CLASSPATH:=$(LOCAL_CLASSPATH) full_java_lib_deps := +$(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 |