Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b142da3 authored by Ying Wang's avatar Ying Wang
Browse files

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
parent aee4daac

core/droiddoc.mk

+7 −0
Original line number Diff line number Diff line
@@ -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) \