diff options
author | Nan Zhang | 2018-06-06 18:01:51 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2018-06-06 18:01:51 -0500 |
commit | d46e250b8bee905715e9c6dcb67b5bed3c9f8279 (patch) | |
tree | 978cc8aa86530366d50de2cd86a1abd13c439f4b | |
parent | ef449b9250baa0f186165cc76dc37c5738609696 (diff) | |
parent | d058de4a773ac610a00941aa21342c892fcc6dc8 (diff) | |
download | platform-build-d46e250b8bee905715e9c6dcb67b5bed3c9f8279.tar.gz platform-build-d46e250b8bee905715e9c6dcb67b5bed3c9f8279.tar.xz platform-build-d46e250b8bee905715e9c6dcb67b5bed3c9f8279.zip |
Merge "Change droiddoc.mk to support metalava" into pi-dev
-rw-r--r-- | core/clear_vars.mk | 4 | ||||
-rw-r--r-- | core/droiddoc.mk | 207 |
2 files changed, 140 insertions, 71 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 95a655362..1e2eda2fe 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk | |||
@@ -74,6 +74,10 @@ LOCAL_DROIDDOC_SOURCE_PATH:= | |||
74 | LOCAL_DROIDDOC_STUB_OUT_DIR:= | 74 | LOCAL_DROIDDOC_STUB_OUT_DIR:= |
75 | LOCAL_DROIDDOC_TEMPLATE_DIR:= | 75 | LOCAL_DROIDDOC_TEMPLATE_DIR:= |
76 | LOCAL_DROIDDOC_USE_STANDARD_DOCLET:= | 76 | LOCAL_DROIDDOC_USE_STANDARD_DOCLET:= |
77 | LOCAL_DROIDDOC_USE_METALAVA:= | ||
78 | LOCAL_DROIDDOC_METALAVA_PREVIOUS_API:= | ||
79 | LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED:= | ||
80 | LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR:= | ||
77 | LOCAL_DX_FLAGS:= | 81 | LOCAL_DX_FLAGS:= |
78 | LOCAL_EMMA_COVERAGE_FILTER:= | 82 | LOCAL_EMMA_COVERAGE_FILTER:= |
79 | LOCAL_EMMA_INSTRUMENT:= | 83 | LOCAL_EMMA_INSTRUMENT:= |
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index b174f31a4..ae64052ee 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk | |||
@@ -15,12 +15,9 @@ | |||
15 | # | 15 | # |
16 | 16 | ||
17 | $(call record-module-type,DROIDDOC) | 17 | $(call record-module-type,DROIDDOC) |
18 | ## | 18 | ########################################################### |
19 | ## | 19 | ## Common logic to both droiddoc and javadoc |
20 | ## Common to both droiddoc and javadoc | 20 | ########################################################### |
21 | ## | ||
22 | ## | ||
23 | |||
24 | LOCAL_IS_HOST_MODULE := $(call true-or-empty,$(LOCAL_IS_HOST_MODULE)) | 21 | LOCAL_IS_HOST_MODULE := $(call true-or-empty,$(LOCAL_IS_HOST_MODULE)) |
25 | ifeq ($(LOCAL_IS_HOST_MODULE),true) | 22 | ifeq ($(LOCAL_IS_HOST_MODULE),true) |
26 | my_prefix := HOST_ | 23 | my_prefix := HOST_ |
@@ -54,6 +51,7 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets | |||
54 | endif | 51 | endif |
55 | 52 | ||
56 | ifeq ($(LOCAL_IS_HOST_MODULE),true) | 53 | ifeq ($(LOCAL_IS_HOST_MODULE),true) |
54 | |||
57 | $(full_target): PRIVATE_BOOTCLASSPATH := | 55 | $(full_target): PRIVATE_BOOTCLASSPATH := |
58 | full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\ | 56 | full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\ |
59 | $(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES))) | 57 | $(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES))) |
@@ -128,18 +126,10 @@ $(call dump-words-to-file, $(2), $(1)) | |||
128 | $(hide) for d in $(3) ; do find $$d -name '*.java' -and -not -name '.*' >> $(1) 2> /dev/null ; done ; true | 126 | $(hide) for d in $(3) ; do find $$d -name '*.java' -and -not -name '.*' >> $(1) 2> /dev/null ; done ; true |
129 | endef | 127 | endef |
130 | 128 | ||
131 | ifeq (a,b) | 129 | ########################################################### |
132 | $(full_target): PRIVATE_PROFILING_OPTIONS := \ | 130 | ## Logic for droiddoc only |
133 | -J-agentlib:jprofilerti=port=8849 -J-Xbootclasspath/a:/Applications/jprofiler5/bin/agent.jar | 131 | ########################################################### |
134 | endif | ||
135 | |||
136 | |||
137 | ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true) | 132 | ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true) |
138 | ## | ||
139 | ## | ||
140 | ## droiddoc only | ||
141 | ## | ||
142 | ## | ||
143 | 133 | ||
144 | droiddoc_templates := \ | 134 | droiddoc_templates := \ |
145 | $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f $(if $(ALLOW_MISSING_DEPENDENCIES),2>/dev/null))) | 135 | $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f $(if $(ALLOW_MISSING_DEPENDENCIES),2>/dev/null))) |
@@ -150,10 +140,6 @@ ifdef ALLOW_MISSING_DEPENDENCIES | |||
150 | endif | 140 | endif |
151 | endif | 141 | endif |
152 | 142 | ||
153 | droiddoc := \ | ||
154 | $(HOST_JDK_TOOLS_JAR) \ | ||
155 | $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) | ||
156 | |||
157 | $(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) | 143 | $(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) |
158 | $(full_target): PRIVATE_CURRENT_BUILD := -hdf page.build $(BUILD_ID)-$(BUILD_NUMBER_FROM_FILE) | 144 | $(full_target): PRIVATE_CURRENT_BUILD := -hdf page.build $(BUILD_ID)-$(BUILD_NUMBER_FROM_FILE) |
159 | $(full_target): PRIVATE_CURRENT_TIME := -hdf page.now "$$($(DATE_FROM_FILE) "+%d %b %Y %k:%M")" | 145 | $(full_target): PRIVATE_CURRENT_TIME := -hdf page.now "$$($(DATE_FROM_FILE) "+%d %b %Y %k:%M")" |
@@ -175,18 +161,127 @@ else | |||
175 | $(full_target): PRIVATE_ADDITIONAL_HTML_DIR := | 161 | $(full_target): PRIVATE_ADDITIONAL_HTML_DIR := |
176 | endif | 162 | endif |
177 | 163 | ||
178 | # TODO: not clear if this is used any more | 164 | # TODO(nanzhang): Remove it if this is not used any more |
179 | $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) | 165 | $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) |
180 | 166 | ||
167 | ifeq ($(strip $(LOCAL_DROIDDOC_USE_METALAVA)),true) | ||
168 | ifneq (,$(filter --generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))) | ||
169 | |||
170 | pos = $(if $(findstring $1,$2),$(call pos,$1,$(wordlist 2,$(words $2),$2),x $3),$3) | ||
171 | metalava_args := $(wordlist 1, $(words $(call pos,--generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))), \ | ||
172 | $(LOCAL_DROIDDOC_OPTIONS)) | ||
173 | remaining_args := $(wordlist $(words $(call pos,--generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))), \ | ||
174 | $(words $(LOCAL_DROIDDOC_OPTIONS)), $(LOCAL_DROIDDOC_OPTIONS)) | ||
175 | doclava_args := $(wordlist 2, $(words $(remaining_args)), $(remaining_args)) | ||
176 | |||
177 | ifneq ($(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API),) | ||
178 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := --check-compatibility --previous-api $(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API) | ||
179 | else | ||
180 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := | ||
181 | endif #!LOCAL_DROIDDOC_METALAVA_PREVIOUS_API | ||
182 | |||
183 | metalava_annotations_deps := | ||
184 | ifeq ($(strip $(LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED)),true) | ||
185 | ifeq ($(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API),) | ||
186 | $(error $(LOCAL_PATH): LOCAL_DROIDDOC_METALAVA_PREVIOUS_API has to be non-empty if metalava annotations was enabled!) | ||
187 | endif | ||
188 | ifeq ($(LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR),) | ||
189 | $(error $(LOCAL_PATH): LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR has to be non-empty if metalava annotations was enabled!) | ||
190 | endif | ||
191 | |||
192 | $(full_target): PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS := --include-annotations --migrate-nullness \ | ||
193 | --extract-annotations $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip \ | ||
194 | --merge-annotations $(LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR) \ | ||
195 | --hide HiddenTypedefConstant --hide SuperfluousPrefix --hide AnnotationExtraction | ||
196 | metalava_annotations_deps := $(sort $(shell find $(LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR) -type f)) | ||
197 | else | ||
198 | $(full_target): PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS := | ||
199 | endif #LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED=true | ||
200 | |||
201 | $(full_target): \ | ||
202 | $(full_src_files) $(LOCAL_GENERATED_SOURCES) \ | ||
203 | $(droiddoc_templates) \ | ||
204 | $(HOST_JDK_TOOLS_JAR) \ | ||
205 | $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
206 | $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
207 | $(HOST_OUT_JAVA_LIBRARIES)/metalava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
208 | $(html_dir_files) \ | ||
209 | $(full_java_libs) \ | ||
210 | $(ZIPSYNC) \ | ||
211 | $(LOCAL_SRCJARS) \ | ||
212 | $(LOCAL_ADDITIONAL_DEPENDENCIES) \ | ||
213 | $(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API) \ | ||
214 | $(metalava_annotations_deps) | ||
215 | @echo metalava based docs: $(PRIVATE_OUT_DIR) | ||
216 | $(hide) mkdir -p $(dir $@) | ||
217 | $(hide) rm -rf $(PRIVATE_STUB_OUT_DIR) | ||
218 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ | ||
219 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | ||
220 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) | ||
221 | $(hide) ( \ | ||
222 | $(JAVA) -jar $(HOST_OUT_JAVA_LIBRARIES)/metalava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
223 | -encoding UTF-8 -source 1.8 \@$(PRIVATE_SRC_LIST_FILE) \@$(PRIVATE_SRCJAR_LIST_FILE) \ | ||
224 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ | ||
225 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | ||
226 | --sourcepath $(PRIVATE_SOURCE_PATH) \ | ||
227 | --no-banner --color --quiet \ | ||
228 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ | ||
229 | --write-stubs-source-list $(intermediates.COMMON)/stubs-src-list \ | ||
230 | $(metalava_args) $(PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API) $(PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS) \ | ||
231 | $(JAVADOC) -encoding UTF-8 -source 1.8 STUBS_SOURCE_LIST \ | ||
232 | -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file \ | ||
233 | -quiet -doclet com.google.doclava.Doclava -docletpath $(PRIVATE_DOCLETPATH) \ | ||
234 | -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ | ||
235 | $(PRIVATE_DROIDDOC_HTML_DIR) $(PRIVATE_ADDITIONAL_HTML_DIR) \ | ||
236 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ | ||
237 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | ||
238 | -sourcepath $(PRIVATE_SOURCE_PATH) \ | ||
239 | -d $(PRIVATE_OUT_DIR) \ | ||
240 | $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) $(doclava_args) \ | ||
241 | && touch -f $@ ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) | ||
242 | |||
243 | ifeq ($(strip $(LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED)),true) | ||
244 | $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip: $(full_target) | ||
245 | endif | ||
246 | else | ||
247 | # no docs generation | ||
248 | $(full_target): \ | ||
249 | $(full_src_files) $(LOCAL_GENERATED_SOURCES) \ | ||
250 | $(full_java_libs) \ | ||
251 | $(HOST_OUT_JAVA_LIBRARIES)/metalava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
252 | $(ZIPSYNC) \ | ||
253 | $(LOCAL_SRCJARS) \ | ||
254 | $(LOCAL_ADDITIONAL_DEPENDENCIES) | ||
255 | @echo metalava based stubs: $@ | ||
256 | $(hide) mkdir -p $(dir $@) | ||
257 | $(hide) rm -rf $(PRIVATE_STUB_OUT_DIR) | ||
258 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ | ||
259 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | ||
260 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) | ||
261 | $(hide) ( \ | ||
262 | $(JAVA) -jar $(HOST_OUT_JAVA_LIBRARIES)/metalava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
263 | -encoding UTF-8 -source 1.8 \@$(PRIVATE_SRC_LIST_FILE) \@$(PRIVATE_SRCJAR_LIST_FILE) \ | ||
264 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ | ||
265 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | ||
266 | --sourcepath $(PRIVATE_SOURCE_PATH) \ | ||
267 | $(PRIVATE_DROIDDOC_OPTIONS) --no-banner --color --quiet \ | ||
268 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ | ||
269 | && touch -f $@ ) || (rm -rf $(PRIVATE_SRC_LIST_FILE); exit 45) | ||
270 | |||
271 | endif # stubs + docs generation | ||
272 | |||
273 | else | ||
274 | |||
181 | # TODO(tobiast): Clean this up once we move to -source 1.9. | 275 | # TODO(tobiast): Clean this up once we move to -source 1.9. |
182 | # OpenJDK 9 does not have the concept of a "boot classpath" so we should | 276 | # OpenJDK 9 does not have the concept of a "boot classpath" so we should |
183 | # then rename PRIVATE_BOOTCLASSPATH to PRIVATE_MODULE or similar. For now, | 277 | # then rename PRIVATE_BOOTCLASSPATH to PRIVATE_MODULE or similar. For now, |
184 | # keep -bootclasspath here since it works in combination with -source 1.8. | 278 | # keep -bootclasspath here since it works in combination with -source 1.8. |
185 | $(full_target): \ | 279 | $(full_target): \ |
186 | $(full_src_files) \ | 280 | $(full_src_files) $(LOCAL_GENERATED_SOURCES) \ |
187 | $(LOCAL_GENERATED_SOURCES) \ | ||
188 | $(droiddoc_templates) \ | 281 | $(droiddoc_templates) \ |
189 | $(droiddoc) \ | 282 | $(HOST_JDK_TOOLS_JAR) \ |
283 | $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
284 | $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) \ | ||
190 | $(html_dir_files) \ | 285 | $(html_dir_files) \ |
191 | $(full_java_libs) \ | 286 | $(full_java_libs) \ |
192 | $(ZIPSYNC) \ | 287 | $(ZIPSYNC) \ |
@@ -200,39 +295,25 @@ $(full_target): \ | |||
200 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) | 295 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) |
201 | $(hide) ( \ | 296 | $(hide) ( \ |
202 | $(JAVADOC) \ | 297 | $(JAVADOC) \ |
203 | -encoding UTF-8 \ | 298 | -encoding UTF-8 -source 1.8 \@$(PRIVATE_SRC_LIST_FILE) \@$(PRIVATE_SRCJAR_LIST_FILE) \ |
204 | -source 1.8 \ | 299 | -J-Xmx1600m -J-XX:-OmitStackTraceInFastThrow -XDignore.symbol.file \ |
205 | \@$(PRIVATE_SRC_LIST_FILE) \ | 300 | -quiet -doclet com.google.doclava.Doclava -docletpath $(PRIVATE_DOCLETPATH) \ |
206 | \@$(PRIVATE_SRCJAR_LIST_FILE) \ | ||
207 | -J-Xmx1600m \ | ||
208 | -J-XX:-OmitStackTraceInFastThrow \ | ||
209 | -XDignore.symbol.file \ | ||
210 | $(PRIVATE_PROFILING_OPTIONS) \ | ||
211 | -quiet \ | ||
212 | -doclet com.google.doclava.Doclava \ | ||
213 | -docletpath $(PRIVATE_DOCLETPATH) \ | ||
214 | -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ | 301 | -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ |
215 | $(PRIVATE_DROIDDOC_HTML_DIR) \ | 302 | $(PRIVATE_DROIDDOC_HTML_DIR) $(PRIVATE_ADDITIONAL_HTML_DIR) \ |
216 | $(PRIVATE_ADDITIONAL_HTML_DIR) \ | ||
217 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ | 303 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ |
218 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | 304 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ |
219 | -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ | 305 | -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ |
220 | -d $(PRIVATE_OUT_DIR) \ | 306 | -d $(PRIVATE_OUT_DIR) \ |
221 | $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) \ | 307 | $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) $(PRIVATE_DROIDDOC_OPTIONS) \ |
222 | $(PRIVATE_DROIDDOC_OPTIONS) \ | ||
223 | $(addprefix -stubs ,$(PRIVATE_STUB_OUT_DIR)) \ | 308 | $(addprefix -stubs ,$(PRIVATE_STUB_OUT_DIR)) \ |
224 | && touch -f $@ \ | 309 | && touch -f $@ ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) |
225 | ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) | 310 | endif #LOCAL_DROIDDOC_USE_METALAVA |
226 | |||
227 | |||
228 | 311 | ||
229 | else | 312 | else |
230 | ## | ||
231 | ## | ||
232 | ## standard doclet only | ||
233 | ## | ||
234 | ## | ||
235 | 313 | ||
314 | ########################################################### | ||
315 | ## Logic for javadoc only | ||
316 | ########################################################### | ||
236 | ifdef USE_OPENJDK9 | 317 | ifdef USE_OPENJDK9 |
237 | # For OpenJDK 9 we use --patch-module to define the core libraries code. | 318 | # For OpenJDK 9 we use --patch-module to define the core libraries code. |
238 | # TODO(tobiast): Reorganize this when adding proper support for OpenJDK 9 | 319 | # TODO(tobiast): Reorganize this when adding proper support for OpenJDK 9 |
@@ -250,31 +331,15 @@ $(full_target): $(full_src_files) $(LOCAL_GENERATED_SOURCES) $(full_java_libs) $ | |||
250 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | 331 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) |
251 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) | 332 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) |
252 | $(hide) ( \ | 333 | $(hide) ( \ |
253 | $(JAVADOC) \ | 334 | $(JAVADOC) -encoding UTF-8 \@$(PRIVATE_SRC_LIST_FILE) \@$(PRIVATE_SRCJAR_LIST_FILE) \ |
254 | -encoding UTF-8 \ | 335 | $(PRIVATE_DROIDDOC_OPTIONS) -J-Xmx1024m -XDignore.symbol.file -Xdoclint:none -quiet \ |
255 | $(PRIVATE_DROIDDOC_OPTIONS) \ | 336 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) $(PRIVATE_BOOTCLASSPATH_ARG) \ |
256 | \@$(PRIVATE_SRC_LIST_FILE) \ | 337 | -sourcepath $(PRIVATE_SOURCE_PATH) \ |
257 | \@$(PRIVATE_SRCJAR_LIST_FILE) \ | ||
258 | -J-Xmx1024m \ | ||
259 | -XDignore.symbol.file \ | ||
260 | -Xdoclint:none \ | ||
261 | $(PRIVATE_PROFILING_OPTIONS) \ | ||
262 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | ||
263 | $(PRIVATE_BOOTCLASSPATH_ARG) \ | ||
264 | -sourcepath $(PRIVATE_SOURCE_PATH)$(addprefix :,$(PRIVATE_CLASSPATH)) \ | ||
265 | -d $(PRIVATE_OUT_DIR) \ | 338 | -d $(PRIVATE_OUT_DIR) \ |
266 | -quiet \ | ||
267 | && touch -f $@ \ | 339 | && touch -f $@ \ |
268 | ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) | 340 | ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) |
269 | 341 | ||
270 | 342 | endif # !LOCAL_DROIDDOC_USE_STANDARD_DOCLET | |
271 | endif | ||
272 | ## | ||
273 | ## | ||
274 | ## Common to both droiddoc and javadoc | ||
275 | ## | ||
276 | ## | ||
277 | |||
278 | 343 | ||
279 | ALL_DOCS += $(full_target) | 344 | ALL_DOCS += $(full_target) |
280 | 345 | ||
@@ -296,4 +361,4 @@ $(LOCAL_MODULE)-docs.zip : $(out_zip) | |||
296 | 361 | ||
297 | $(call dist-for-goals,docs,$(out_zip)) | 362 | $(call dist-for-goals,docs,$(out_zip)) |
298 | 363 | ||
299 | endif | 364 | endif #!LOCAL_UNINSTALLABLE_MODULE |