tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am cb733bc5: Merge "Fix droiddoc generation."

Browse source 
* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
  Fix droiddoc generation.
This commit is contained in:
Ying Wang 2014-04-07 22:31:18 +00:00 committed by Android Git Automerger
commit 90219d985f
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/droiddoc.mk
View file

@ -52,12 +52,7 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets
endif endif
$(full_target): PRIVATE_BOOTCLASSPATH := $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core)
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) ifneq ($(LOCAL_IS_HOST_MODULE),true)
@ -202,6 +197,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps)
-J-Xmx1024m \ -J-Xmx1024m \
$(PRIVATE_PROFILING_OPTIONS) \ $(PRIVATE_PROFILING_OPTIONS) \
$(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
$(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \
-sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \
-d $(PRIVATE_OUT_DIR) \ -d $(PRIVATE_OUT_DIR) \
-quiet \ -quiet \