commit 76228ffa13c3101c1a74cc561c171c4064593796
author Martin Stjernholm <mast@google.com> Thu Jul 16 22:17:09 2020 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 14:26:04 2020 +0000
tree 7c3953da8830d0fc0b13fd6504421c1ee50cdcb0
parent e886d68b9c40c941d8966b9c90d0e265c75fb19e

Ninja doesn't like dependencies on directories.

Also ensure target directory cleanup before copying the i18n data file
there.

Test: art/tools/buildbot-build.sh --host
Test: art/test/testrunner/run_build_test_target.py art-test
Bug: 157734636
Bug: 129332183
Change-Id: I6d9ac8f353e1c78ac6247bd75d7c7598d57fb56d

Android.mk

diff --git a/Android.mk b/Android.mk
index 776906d..b50af78 100644
--- a/Android.mk
+++ b/Android.mk
@@ -469,14 +469,16 @@
 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-file := $(HOST_OUT)/$(I18N_APEX)/etc
-$(host-i18n-data-file): $(TARGET_OUT)/apex/$(I18N_APEX).apex $(HOST_OUT)/bin/deapexer
+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)
 	mkdir -p $(HOST_OUT)/$(I18N_APEX)/
 	cp -R $(TARGET_OUT)/apex/$(I18N_APEX)/etc/ $(HOST_OUT)/$(I18N_APEX)/
+	touch $@
 
 .PHONY: build-art-host
-build-art-host:   $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(host-i18n-data-file)
+build-art-host:   $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(host-i18n-data-timestamp)
 
 .PHONY: build-art-target
 build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUTS)

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index a35462a..edf1891 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -177,7 +177,7 @@
   # Dependencies for all host gtests.
   gtest_deps := $$(ART_HOST_DEX_DEPENDENCIES) \
     $$(ART_TEST_HOST_GTEST_DEPENDENCIES) \
-    $$(HOST_OUT)/$$(I18N_APEX)/etc \
+    $$(HOST_OUT)/$$(I18N_APEX)/timestamp \
     $$(HOST_BOOT_IMAGE_JARS) \
     $$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libicu_jni$$(ART_HOST_SHLIB_EXTENSION) \
     $$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
@@ -256,7 +256,7 @@
   gtest_suffix :=
 endef  # define-art-gtest-rule-host
 
-ART_TEST_HOST_GTEST_DEPENDENCIES := $(host-i18n-data-file)
+ART_TEST_HOST_GTEST_DEPENDENCIES := $(host-i18n-data-timestamp)
 ART_TEST_TARGET_GTEST_DEPENDENCIES := $(TESTING_ART_APEX)
 
 # Add the additional dependencies for the specified test