From 846c5acd90fbc1bf785241b42880bb74b43b831b Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 9 Sep 2022 16:50:04 -0700 Subject: [PATCH] Add license metadata to non-module targets. Bug: 240149934 Test: m droid dist Change-Id: I2228a9e3b347eb5db97ab776098a563567a5ac2c --- build/tools/sdk_repo.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk index febd8fda1..1f88b242f 100644 --- a/build/tools/sdk_repo.mk +++ b/build/tools/sdk_repo.mk @@ -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 # -----------------------------------------------------------------