From 696b533ad765346a7eb242d5f7b7678bb5977dd9 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 13 Sep 2022 00:52:29 +0000 Subject: [PATCH] Revert "Add license metadata to non-module targets." This reverts commit 846c5acd90fbc1bf785241b42880bb74b43b831b. Reason for revert: breaks sdk target on aosp-master Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20 --- build/tools/sdk_repo.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk index 1f88b242f..febd8fda1 100644 --- a/build/tools/sdk_repo.mk +++ b/build/tools/sdk_repo.mk @@ -39,9 +39,6 @@ $(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 @@ -65,9 +62,6 @@ $(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 @@ -95,9 +89,6 @@ $(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. @@ -116,9 +107,6 @@ $(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. @@ -132,9 +120,6 @@ $(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 # -----------------------------------------------------------------