Add i18n as dependency of host run tests.
Bug: 157734636
Test: ./art/test/testrunner/run_build_test_target.py -j80 art-interpreter-tracing
Change-Id: If0b4fa8ba3b320e44fcc60c31ee65f589bd276bf
diff --git a/Android.mk b/Android.mk
index b50af78..c70b945 100644
--- a/Android.mk
+++ b/Android.mk
@@ -469,7 +469,6 @@
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 := $(HOST_OUT)/$(I18N_APEX)/timestamp
$(host-i18n-data-timestamp): $(TARGET_OUT)/apex/$(I18N_APEX).apex $(HOST_OUT)/bin/deapexer
$(call extract-from-apex,$(I18N_APEX))
rm -rf $(HOST_OUT)/$(I18N_APEX)
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 801a448..2c0976d 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -127,4 +127,7 @@
# i18n APEX
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
+
endif # ART_ANDROID_COMMON_PATH_MK
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index aa6c43d..943aefe 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -71,6 +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)
ifneq ($(HOST_PREFER_32_BIT),true)
ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \