p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc 

am: 675d7d56e8

Change-Id: Iaccc55cb744edb3375173ea11ee040bb8c220f61
This commit is contained in:
Tobias Thierer 2017-07-19 10:06:30 +00:00 committed by android-build-merger
parent 07d26d46d0 675d7d56e8
commit bce2e113b4
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/droiddoc.mk
View File

@ -166,6 +166,10 @@ endif
# TODO: not clear if this is used any more # TODO: not clear if this is used any more
$(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)
# TODO(tobiast): Clean this up once we move to -source 1.9.
# OpenJDK 9 does not have the concept of a "boot classpath" so we should
# then rename PRIVATE_BOOTCLASSPATH to PRIVATE_MODULE or similar. For now,
# keep -bootclasspath here since it works in combination with -source 1.8.
$(full_target): \ $(full_target): \
$(full_src_files) \ $(full_src_files) \
$(droiddoc_templates) \ $(droiddoc_templates) \
@ -211,6 +215,18 @@ else
## standard doclet only ## standard doclet only
## ##
## ##
ifneq ($(EXPERIMENTAL_USE_OPENJDK9),)
# For OpenJDK 9 we use --patch-module to define the core libraries code.
# TODO(tobiast): Reorganize this when adding proper support for OpenJDK 9
# modules. Here we treat all code in core libraries as being in java.base
# to work around the OpenJDK 9 module system. http://b/62049770
$(full_target): PRIVATE_BOOTCLASSPATH_ARG := --patch-module=java.base=$(PRIVATE_BOOTCLASSPATH)
else
# For OpenJDK 8 we can use -bootclasspath to define the core libraries code.
$(full_target): PRIVATE_BOOTCLASSPATH_ARG := $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH))
endif
$(full_target): $(full_src_files) $(full_java_lib_deps) $(full_target): $(full_src_files) $(full_java_lib_deps)
@echo Docs javadoc: $(PRIVATE_OUT_DIR) @echo Docs javadoc: $(PRIVATE_OUT_DIR)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@ -226,7 +242,7 @@ $(full_target): $(full_src_files) $(full_java_lib_deps)
-Xdoclint:none \ -Xdoclint:none \
$(PRIVATE_PROFILING_OPTIONS) \ $(PRIVATE_PROFILING_OPTIONS) \
$(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
$(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(PRIVATE_BOOTCLASSPATH_ARG) \
-sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \
-d $(PRIVATE_OUT_DIR) \ -d $(PRIVATE_OUT_DIR) \
-quiet \ -quiet \