From 88895e52334c663111550b53c248e50cd30a2dc9 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Thu, 27 Apr 2023 09:24:14 +0900 Subject: [PATCH] Deprecate FILE_NAME_TAG Test: m dist Bug: 278060169 Change-Id: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a Merged-In: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a --- build/tools/sdk_repo.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk index 1f88b242f..2f12f9fa1 100644 --- a/build/tools/sdk_repo.mk +++ b/build/tools/sdk_repo.mk @@ -15,7 +15,7 @@ SDK_SYSIMG_XML_ARGS := # $3=package to create (e.g. tools, docs, etc.) # define sdk-repo-pkg-zip -$(dir $(2))/sdk-repo-$(1)-$(3)-$(FILE_NAME_TAG).zip +$(dir $(2))/sdk-repo-$(1)-$(3).zip endef # Defines the rule to build an SDK repository package by zipping all @@ -36,7 +36,7 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(hide) cd $(basename $(3)) && \ rm -f ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \ zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(4)/* -$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) +$(call dist-for-goals-with-filenametag, 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))) @@ -62,7 +62,7 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(hide) cd $(basename $(3))/$(4) && \ rm -f ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \ zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) * -$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) +$(call dist-for-goals-with-filenametag, 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))) @@ -92,7 +92,7 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(hide) cd $(basename $(3))/$(5) && \ rm -f ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \ zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) * -$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) +$(call dist-for-goals-with-filenametag, 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))) @@ -113,7 +113,7 @@ $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) development/build/tools/mk_sources development/build/tools/mk_sources_zip.py --exec-zip \ $(HOST_OUT)/development/sdk/source_source.properties \ $$@ . -$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) +$(call dist-for-goals-with-filenametag, 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)))