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

Commit fc0dcc1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Non-module targets."

parents 95601112 b03c16ba

core/soong_droiddoc_prebuilt.mk

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ endif 


ifdef LOCAL_DROIDDOC_STUBS_SRCJAR

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_STUBS_SRCJAR),$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar))

$(eval ALL_TARGETS.$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar.META_LIC := $(LOCAL_SOONG_LICENSE_METADATA))

ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar



.PHONY: $(LOCAL_MODULE)
@@ -14,6 +15,7 @@ endif 


ifdef LOCAL_DROIDDOC_DOC_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip))

$(eval ALL_TARGETS.$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip.META_LIC := $(LOCAL_SOONG_LICENSE_METADATA))

$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)



.PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE)-docs.zip
@@ -23,12 +25,15 @@ endif 


ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip))

$(eval ALL_TARGETS.$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip.META_LIC := $(LOCAL_SOONG_LICENSE_METADATA))

endif



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))

$(eval ALL_TARGETS.$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_generated-api-versions.xml.META_LIC := $(LOCAL_SOONG_LICENSE_METADATA))

endif



ifdef LOCAL_DROIDDOC_METADATA_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_METADATA_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)-metadata.zip))

$(eval ALL_TARGETS.$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)-metadata.zip.META_LIC := $(LOCAL_SOONG_LICENSE_METADATA))

endif

core/tasks/find-shareduid-violation.mk

+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ $(shareduid_violation_modules_filename): $(AAPT2) 
		--copy_out_system_ext $(TARGET_COPY_OUT_SYSTEM_EXT) \

		> $@



$(call declare-0p-target,$(shareduid_violation_modules_filename))

$(call dist-for-goals,droidcore,$(shareduid_violation_modules_filename))