Upper-case the i18n host data path for consistency.
Bug: 157734636
Test: m
Change-Id: I6a79114b63c020fe77f1cc51faab8664802970c6
diff --git a/Android.mk b/Android.mk
index c70b945..7ce7ed8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -469,7 +469,7 @@
build-art: build-art-host build-art-target
# For host, we extract the ICU data from the apex and install it to HOST_OUT/I18N_APEX.
-$(host-i18n-data-timestamp): $(TARGET_OUT)/apex/$(I18N_APEX).apex $(HOST_OUT)/bin/deapexer
+$(HOST_I18N_DATA): $(TARGET_OUT)/apex/$(I18N_APEX).apex $(HOST_OUT)/bin/deapexer
$(call extract-from-apex,$(I18N_APEX))
rm -rf $(HOST_OUT)/$(I18N_APEX)
mkdir -p $(HOST_OUT)/$(I18N_APEX)/
@@ -477,7 +477,7 @@
touch $@
.PHONY: build-art-host
-build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(host-i18n-data-timestamp)
+build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(HOST_I18N_DATA)
.PHONY: build-art-target
build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUTS)
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 2c0976d..5cf7322 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -128,6 +128,6 @@
I18N_APEX := com.android.i18n
# A phony file to create the ICU data file for host.
-host-i18n-data-timestamp := $(HOST_OUT)/$(I18N_APEX)/timestamp
+HOST_I18N_DATA := $(HOST_OUT)/$(I18N_APEX)/timestamp
endif # ART_ANDROID_COMMON_PATH_MK
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 1d31e74..dc750d7 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -256,7 +256,7 @@
gtest_suffix :=
endef # define-art-gtest-rule-host
-ART_TEST_HOST_GTEST_DEPENDENCIES := $(host-i18n-data-timestamp)
+ART_TEST_HOST_GTEST_DEPENDENCIES := $(HOST_I18N_DATA)
ART_TEST_TARGET_GTEST_DEPENDENCIES := $(TESTING_ART_APEX)
# Add the additional dependencies for the specified test
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 943aefe..8698e71 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -71,7 +71,7 @@
$(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmti$(ART_HOST_SHLIB_EXTENSION) \
$(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmtid$(ART_HOST_SHLIB_EXTENSION) \
$(ART_HOST_DEX_DEPENDENCIES) \
- $(host-i18n-data-timestamp)
+ $(HOST_I18N_DATA)
ifneq ($(HOST_PREFER_32_BIT),true)
ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \