diff options
author | android-build-team Robot | 2018-06-10 14:07:23 -0500 |
---|---|---|
committer | android-build-team Robot | 2018-06-10 14:08:39 -0500 |
commit | 12b54f32b6783843f3006c1c76f6cd8a0d13a758 (patch) | |
tree | 57a3678317deefd529d3178a12ff3949ffa4e3cc | |
parent | 5c1093ca6481bd65ece11fedad7cd333ec457401 (diff) | |
parent | 3af2baad0a6e4f64ee91cf27b6664d4369dae955 (diff) | |
download | platform-build-12b54f32b6783843f3006c1c76f6cd8a0d13a758.tar.gz platform-build-12b54f32b6783843f3006c1c76f6cd8a0d13a758.tar.xz platform-build-12b54f32b6783843f3006c1c76f6cd8a0d13a758.zip |
Make change and version bump to PPR1.180610.001
Change-Id: I09a8614abcd3674affb0851ad19b328242b0c7f2
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/clear_vars.mk | 1 | ||||
-rw-r--r-- | core/droiddoc.mk | 35 |
3 files changed, 21 insertions, 17 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 2b5f164c0..0426ea19e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk | |||
@@ -18,4 +18,4 @@ | |||
18 | # (like "CRB01"). It must be a single word, and is | 18 | # (like "CRB01"). It must be a single word, and is |
19 | # capitalized by convention. | 19 | # capitalized by convention. |
20 | 20 | ||
21 | export BUILD_ID=PPR1.180608.001 | 21 | export BUILD_ID=PPR1.180610.001 |
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 1e2eda2fe..bd86cfbd1 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk | |||
@@ -78,6 +78,7 @@ LOCAL_DROIDDOC_USE_METALAVA:= | |||
78 | LOCAL_DROIDDOC_METALAVA_PREVIOUS_API:= | 78 | LOCAL_DROIDDOC_METALAVA_PREVIOUS_API:= |
79 | LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED:= | 79 | LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED:= |
80 | LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR:= | 80 | LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR:= |
81 | LOCAL_DROIDDOC_METALAVA_DOCS_STUB_OUT_DIR:= | ||
81 | LOCAL_DX_FLAGS:= | 82 | LOCAL_DX_FLAGS:= |
82 | LOCAL_EMMA_COVERAGE_FILTER:= | 83 | LOCAL_EMMA_COVERAGE_FILTER:= |
83 | LOCAL_EMMA_INSTRUMENT:= | 84 | LOCAL_EMMA_INSTRUMENT:= |
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index ae64052ee..bcd2002e0 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk | |||
@@ -114,6 +114,7 @@ endif | |||
114 | $(full_target): PRIVATE_OUT_DIR := $(out_dir) | 114 | $(full_target): PRIVATE_OUT_DIR := $(out_dir) |
115 | $(full_target): PRIVATE_DROIDDOC_OPTIONS := $(LOCAL_DROIDDOC_OPTIONS) | 115 | $(full_target): PRIVATE_DROIDDOC_OPTIONS := $(LOCAL_DROIDDOC_OPTIONS) |
116 | $(full_target): PRIVATE_STUB_OUT_DIR := $(LOCAL_DROIDDOC_STUB_OUT_DIR) | 116 | $(full_target): PRIVATE_STUB_OUT_DIR := $(LOCAL_DROIDDOC_STUB_OUT_DIR) |
117 | $(full_target): PRIVATE_METALAVA_DOCS_STUB_OUT_DIR := $(LOCAL_DROIDDOC_METALAVA_DOCS_STUB_OUT_DIR) | ||
117 | 118 | ||
118 | # Lists the input files for the doc build into a text file | 119 | # Lists the input files for the doc build into a text file |
119 | # suitable for the @ syntax of javadoc. | 120 | # suitable for the @ syntax of javadoc. |
@@ -165,17 +166,8 @@ endif | |||
165 | $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) | 166 | $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) |
166 | 167 | ||
167 | ifeq ($(strip $(LOCAL_DROIDDOC_USE_METALAVA)),true) | 168 | 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),) | 169 | ifneq ($(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API),) |
178 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := --check-compatibility --previous-api $(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API) | 170 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := --previous-api $(LOCAL_DROIDDOC_METALAVA_PREVIOUS_API) |
179 | else | 171 | else |
180 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := | 172 | $(full_target): PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API := |
181 | endif #!LOCAL_DROIDDOC_METALAVA_PREVIOUS_API | 173 | endif #!LOCAL_DROIDDOC_METALAVA_PREVIOUS_API |
@@ -198,6 +190,15 @@ else | |||
198 | $(full_target): PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS := | 190 | $(full_target): PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS := |
199 | endif #LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED=true | 191 | endif #LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED=true |
200 | 192 | ||
193 | ifneq (,$(filter --generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))) | ||
194 | |||
195 | pos = $(if $(findstring $1,$2),$(call pos,$1,$(wordlist 2,$(words $2),$2),x $3),$3) | ||
196 | metalava_args := $(wordlist 1, $(words $(call pos,--generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))), \ | ||
197 | $(LOCAL_DROIDDOC_OPTIONS)) | ||
198 | remaining_args := $(wordlist $(words $(call pos,--generate-documentation,$(LOCAL_DROIDDOC_OPTIONS))), \ | ||
199 | $(words $(LOCAL_DROIDDOC_OPTIONS)), $(LOCAL_DROIDDOC_OPTIONS)) | ||
200 | doclava_args := $(wordlist 2, $(words $(remaining_args)), $(remaining_args)) | ||
201 | |||
201 | $(full_target): \ | 202 | $(full_target): \ |
202 | $(full_src_files) $(LOCAL_GENERATED_SOURCES) \ | 203 | $(full_src_files) $(LOCAL_GENERATED_SOURCES) \ |
203 | $(droiddoc_templates) \ | 204 | $(droiddoc_templates) \ |
@@ -215,6 +216,7 @@ $(full_target): \ | |||
215 | @echo metalava based docs: $(PRIVATE_OUT_DIR) | 216 | @echo metalava based docs: $(PRIVATE_OUT_DIR) |
216 | $(hide) mkdir -p $(dir $@) | 217 | $(hide) mkdir -p $(dir $@) |
217 | $(hide) rm -rf $(PRIVATE_STUB_OUT_DIR) | 218 | $(hide) rm -rf $(PRIVATE_STUB_OUT_DIR) |
219 | $(hide) rm -rf $(PRIVATE_METALAVA_DOCS_STUB_OUT_DIR) | ||
218 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ | 220 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ |
219 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) | 221 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) |
220 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) | 222 | $(ZIPSYNC) -d $(PRIVATE_SRCJAR_INTERMEDIATES_DIR) -l $(PRIVATE_SRCJAR_LIST_FILE) -f "*.java" $(PRIVATE_SRCJARS) |
@@ -226,6 +228,7 @@ $(full_target): \ | |||
226 | --sourcepath $(PRIVATE_SOURCE_PATH) \ | 228 | --sourcepath $(PRIVATE_SOURCE_PATH) \ |
227 | --no-banner --color --quiet \ | 229 | --no-banner --color --quiet \ |
228 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ | 230 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ |
231 | $(addprefix --doc-stubs ,$(PRIVATE_METALAVA_DOCS_STUB_OUT_DIR)) \ | ||
229 | --write-stubs-source-list $(intermediates.COMMON)/stubs-src-list \ | 232 | --write-stubs-source-list $(intermediates.COMMON)/stubs-src-list \ |
230 | $(metalava_args) $(PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API) $(PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS) \ | 233 | $(metalava_args) $(PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API) $(PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS) \ |
231 | $(JAVADOC) -encoding UTF-8 -source 1.8 STUBS_SOURCE_LIST \ | 234 | $(JAVADOC) -encoding UTF-8 -source 1.8 STUBS_SOURCE_LIST \ |
@@ -239,10 +242,6 @@ $(full_target): \ | |||
239 | -d $(PRIVATE_OUT_DIR) \ | 242 | -d $(PRIVATE_OUT_DIR) \ |
240 | $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) $(doclava_args) \ | 243 | $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) $(doclava_args) \ |
241 | && touch -f $@ ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) | 244 | && 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 | 245 | else |
247 | # no docs generation | 246 | # no docs generation |
248 | $(full_target): \ | 247 | $(full_target): \ |
@@ -264,13 +263,17 @@ $(full_target): \ | |||
264 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ | 263 | $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ |
265 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ | 264 | $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ |
266 | --sourcepath $(PRIVATE_SOURCE_PATH) \ | 265 | --sourcepath $(PRIVATE_SOURCE_PATH) \ |
267 | $(PRIVATE_DROIDDOC_OPTIONS) --no-banner --color --quiet \ | 266 | $(PRIVATE_DROIDDOC_OPTIONS) $(PRIVATE_DROIDDOC_METALAVA_PREVIOUS_API) $(PRIVATE_DROIDDOC_METALAVA_ANNOTATIONS) \ |
267 | --no-banner --color --quiet \ | ||
268 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ | 268 | $(addprefix --stubs ,$(PRIVATE_STUB_OUT_DIR)) \ |
269 | && touch -f $@ ) || (rm -rf $(PRIVATE_SRC_LIST_FILE); exit 45) | 269 | && touch -f $@ ) || (rm -rf $(PRIVATE_SRC_LIST_FILE); exit 45) |
270 | 270 | ||
271 | endif # stubs + docs generation | 271 | endif # stubs + docs generation |
272 | ifeq ($(strip $(LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED)),true) | ||
273 | $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip: $(full_target) | ||
274 | endif | ||
272 | 275 | ||
273 | else | 276 | else # doclava based droiddoc generation |
274 | 277 | ||
275 | # TODO(tobiast): Clean this up once we move to -source 1.9. | 278 | # TODO(tobiast): Clean this up once we move to -source 1.9. |
276 | # OpenJDK 9 does not have the concept of a "boot classpath" so we should | 279 | # OpenJDK 9 does not have the concept of a "boot classpath" so we should |