tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/soong_droiddoc_prebuilt.mk

45 lines
1.8 KiB
Makefile
Raw Normal View History

Add soong_droiddoc_prebuilt.mk Soong droiddoc modules were using soong_java_prebuilt.mk, but they don't need any of the java logic from it, and it includes base_rules.mk which was not included by droiddoc.mk. Add soong_droiddoc_prebuilt.mk that just installs the droiddoc outputs without including base_rules.mk. Fixes building docs modules in mm, mma, and m checkbuild. Bug: 112388925 Test: m docs Change-Id: I4f7262e2c3b1afbee44c1cc306330885b687a074
2018-08-09 06:42:53 +02:00
# Droiddoc prebuilt coming from Soong.
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_droiddoc_prebuilt.mk may only be used from Soong)
endif
ifdef LOCAL_DROIDDOC_STUBS_SRCJAR
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_STUBS_SRCJAR),$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar))
ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar
.PHONY: $(LOCAL_MODULE)
$(LOCAL_MODULE) : $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar
endif
ifdef LOCAL_DROIDDOC_DOC_ZIP
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip))
$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)
Build docs zips with make docs The docs zips were being built for make docs dist but not for make docs. Add them to ALL_DOCS and to the $(LOCAL_MODULE) phony rule. Bug: 123068677 Test: m docs Test: m ds-docs Change-Id: I32634c05e392f7a5483c81d59de35ca9bc4d4ad0
2019-01-19 01:04:06 +01:00
.PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE)-docs.zip
$(LOCAL_MODULE) $(LOCAL_MODULE)-docs.zip : $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
Add soong_droiddoc_prebuilt.mk Soong droiddoc modules were using soong_java_prebuilt.mk, but they don't need any of the java logic from it, and it includes base_rules.mk which was not included by droiddoc.mk. Add soong_droiddoc_prebuilt.mk that just installs the droiddoc outputs without including base_rules.mk. Fixes building docs modules in mm, mma, and m checkbuild. Bug: 112388925 Test: m docs Change-Id: I4f7262e2c3b1afbee44c1cc306330885b687a074
2018-08-09 06:42:53 +02:00
endif
ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip))
endif
Delete apidiff.mk Also remove the msg.mk files used for old apicheck. And export jdiff-doc.zip generated by Soong. Test: api-stubs-docs-diff Bug: b/78245848 Change-Id: I329aa375623a7b7a121d58314dab694a326c9f0f
2018-09-17 23:32:52 +02:00
Copy api-versions.xml to out/target/common/obj/PACKAGING Test: m -j out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml Bug: b/78245848 Change-Id: I77ecc43cd17baf7d7c414bb11e60045724865f43 Merged-In: I77ecc43cd17baf7d7c414bb11e60045724865f43
2018-09-18 19:48:35 +02:00
ifdef LOCAL_DROIDDOC_API_VERSIONS_XML
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_API_VERSIONS_XML),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_generated-api-versions.xml))
endif
Delete apidiff.mk Also remove the msg.mk files used for old apicheck. And export jdiff-doc.zip generated by Soong. Test: api-stubs-docs-diff Bug: b/78245848 Change-Id: I329aa375623a7b7a121d58314dab694a326c9f0f
2018-09-17 23:32:52 +02:00
ifdef LOCAL_DROIDDOC_JDIFF_DOC_ZIP
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_JDIFF_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip))
$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip)
ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip
Build docs zips with make docs The docs zips were being built for make docs dist but not for make docs. Add them to ALL_DOCS and to the $(LOCAL_MODULE) phony rule. Bug: 123068677 Test: m docs Test: m ds-docs Change-Id: I32634c05e392f7a5483c81d59de35ca9bc4d4ad0
2019-01-19 01:04:06 +01:00
.PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff
$(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff : $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip
Delete apidiff.mk Also remove the msg.mk files used for old apicheck. And export jdiff-doc.zip generated by Soong. Test: api-stubs-docs-diff Bug: b/78245848 Change-Id: I329aa375623a7b7a121d58314dab694a326c9f0f
2018-09-17 23:32:52 +02:00
endif
Allow files generated by droidstubs to be copied in the SDK We need to get files generated by a droidstubs target into the SDK. So we first copy them into the out/target/common/obj/PACKAGING folder where they can be picked up by the SDK build. Bug: 142480924 Test: m sdk Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-10-10 20:35:08 +02:00
ifdef LOCAL_DROIDDOC_METADATA_ZIP
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_METADATA_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)-metadata.zip))
endif
Reference in a new issue Copy permalink