commit 8520a96d356cfa1a88525e2f2ba91431c5704acc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 23 08:56:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 08:56:48 2023 +0000
tree 0dcacef3bf7d068e0ab2f5f915e84fbc795a9f12
parent 3b3aef3544df8741d4cf273fb0a7584077e1b233
parent 88895e52334c663111550b53c248e50cd30a2dc9

Merge "Deprecate FILE_NAME_TAG"

build/tools/sdk_repo.mk

diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk
index 1f88b24..2f12f9f 100644
--- a/build/tools/sdk_repo.mk
+++ b/build/tools/sdk_repo.mk
@@ -15,7 +15,7 @@
 # $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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	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)))