Merge "Revert "Revert "Add license metadata to non-module targets.""" am: 01cd913312 am: b69a8ac2ea

Original change: https://android-review.googlesource.com/c/platform/development/+/2215211

Change-Id: I618d5f00e344c01c69ff7e5c4a2d8d93fd21d130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-14 19:51:28 +00:00
committed by Automerger Merge Worker

View File

@@ -39,6 +39,9 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(call declare-1p-container,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),sdk_repo)
$(call declare-container-license-deps,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),$(3),$(PRODUCT_OUT)/:/)
endef
# Defines the rule to build an SDK repository package when the
@@ -62,6 +65,9 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(call declare-1p-container,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),sdk_repo)
$(call declare-container-license-deps,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),$(3),$(PRODUCT_OUT)/:/)
endef
# Defines the rule to build an SDK repository package when the
@@ -89,6 +95,9 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(call declare-1p-container,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),sdk_repo)
$(call declare-container-license-deps,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),$(3),$(PRODUCT_OUT)/:/)
endef
# Defines the rule to build an SDK sources package.
@@ -107,6 +116,9 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) development/build/tools/mk_sources
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)):$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(call declare-1p-container,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),sdk_repo)
$(call declare-container-license-deps,$(call sdk-repo-pkg-zip,$(2),$(3),$(4)),$(3) $(HOST_OUT)/development/sdk/source_source.properties,$(PRODUCT_OUT)/:/)
endef
# Defines the rule to build an XML file for a package.
@@ -120,6 +132,9 @@ $(1): $$(XMLLINT) development/build/tools/mk_sdk_repo_xml.sh $(2) $(3)
XMLLINT=$$(XMLLINT) development/build/tools/mk_sdk_repo_xml.sh $$@ $(2) $(4)
$$(call dist-for-goals,sdk_repo,$(1))
$(call declare-1p-target,$(1),sdk_repo)
$(call declare-container-license-deps,$(1),$(2) $(3),$(PRODUCT_OUT)/:/)
endef
# -----------------------------------------------------------------