Deprecate FILE_NAME_TAG
Bug: 278060169
Test: m dist
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:49672d1f240c635cc5a51aacc16a24db2d092258)
Merged-In: Id518094a530401c4781f7ba4e7f799a4b91b0826
Change-Id: Id518094a530401c4781f7ba4e7f799a4b91b0826
diff --git a/tasks/emu_img_zip.mk b/tasks/emu_img_zip.mk
index c973e6a..8e2e318 100644
--- a/tasks/emu_img_zip.mk
+++ b/tasks/emu_img_zip.mk
@@ -63,7 +63,7 @@
-name := sdk-repo-linux-system-images-$(FILE_NAME_TAG)
+name := sdk-repo-linux-system-images
INTERNAL_EMULATOR_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
@@ -93,7 +93,7 @@
.PHONY: emu_img_zip
emu_img_zip: $(INTERNAL_EMULATOR_PACKAGE_TARGET)
-INTERNAL_EMULATOR_KERNEL_TARGET := $(PRODUCT_OUT)/emu-gki-$(TARGET_KERNEL_USE)-$(FILE_NAME_TAG).zip
+INTERNAL_EMULATOR_KERNEL_TARGET := $(PRODUCT_OUT)/emu-gki-$(TARGET_KERNEL_USE).zip
INTERNAL_GKI_SOURCE := $(INTERNAL_EMULATOR_PACKAGE_SOURCE)/GKI-$(TARGET_KERNEL_USE)
$(INTERNAL_EMULATOR_KERNEL_TARGET): $(INSTALLED_QEMU_RAMDISKIMAGE) $(EMULATOR_KERNEL_FILE)
@echo "Package: $@"
@@ -105,6 +105,6 @@
.PHONY: emu_kernel_zip
emu_kernel_zip: $(INTERNAL_EMULATOR_KERNEL_TARGET)
-$(call dist-for-goals, emu_kernel_zip, $(INTERNAL_EMULATOR_KERNEL_TARGET))
+$(call dist-for-goals-with-filenametag, emu_kernel_zip, $(INTERNAL_EMULATOR_KERNEL_TARGET))
endif
endif
diff --git a/tools/Android.mk b/tools/Android.mk
index 367be42..3d5d0f9 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -44,7 +44,7 @@
EMU_EXTRA_FILES += device/generic/goldfish/data/etc/encryptionkey.img
EMU_EXTRA_FILES += device/generic/goldfish/data/etc/userdata.img
-name := emu-extra-linux-system-images-$(FILE_NAME_TAG)
+name := emu-extra-linux-system-images
EMU_EXTRA_TARGET := $(PRODUCT_OUT)/$(name).zip
@@ -78,7 +78,7 @@
.PHONY: emu_extra_imgs
emu_extra_imgs: $(EMU_EXTRA_TARGET)
-$(call dist-for-goals, emu_extra_imgs, $(EMU_EXTRA_TARGET))
+$(call dist-for-goals-with-filenametag, emu_extra_imgs, $(EMU_EXTRA_TARGET))
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
