am cb733bc5
: Merge "Fix droiddoc generation."
* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f': Fix droiddoc generation.
This commit is contained in:
commit
90219d985f
1 changed files with 2 additions and 6 deletions
|
@ -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 \
|
||||
|
|
Loading…
Reference in a new issue