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

Commit 521b22cf authored by Colin Cross's avatar Colin Cross
Browse files

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

core/soong_droiddoc_prebuilt.mk

0 → 100644
+25 −0
Original line number Diff line number Diff line 
# 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)



.PHONY: $(LOCAL_MODULE)-docs.zip

$(LOCAL_MODULE)-docs.zip : $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip

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

core/soong_java_prebuilt.mk

+0 −14
Original line number Diff line number Diff line
@@ -24,20 +24,6 @@ greylist_txt := $(intermediates.COMMON)/greylist.txt 
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_jar)))

$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_proguard_jar)))



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

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)

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



ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

    $(intermediates.COMMON)/jacoco-report-classes.jar))