Add dependency on LOCAL_BUILT_MODULE, not LOCAL_INSTALLED_MODULE
That's because the timestamp of LOCAL_INSTALLED_MODULE is copied
from that of LOCAL_BUILT_MODULE, so if LOCAL_BUILT_MODULE is
old copying it to LOCAL_INSTALLED_MODULE will create an old file
that'll never be up-to-date
Also, use an explicit timestamp file instead of a directory:
directories' timestamps aren't reliable enough to use with
make, as they get updated as side effects of other rules.
Change-Id: Icee1887e0e274eee5184ebfcff614ce3285f3403
diff --git a/tools/vm-tests/Android.mk b/tools/vm-tests/Android.mk
index 84673a8..9c8051e 100644
--- a/tools/vm-tests/Android.mk
+++ b/tools/vm-tests/Android.mk
@@ -73,15 +73,16 @@
# generated and compile the host side junit tests
$(hide) java -cp $(subst $(space),$(colon),$^):$(HOST_JDK_TOOLS_JAR) util.build.BuildDalvikSuite $(PRIVATE_SRC_FOLDER) $(PRIVATE_INTERMEDIATES) $<:$(PRIVATE_LIB_FOLDER)/junit.jar $(PRIVATE_INTERMEDIATES_MAIN_FILES) $(BUILD_UTIL_INTERMEDIATES_CLASSES) $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES) $$RUN_VM_TESTS_RTO
@echo "wrote generated Main_*.java files to $(PRIVATE_INTERMEDIATES_MAIN_FILES)"
-INSTALLED_TESTS := $(dir $(LOCAL_INSTALLED_MODULE))/../cts_dalviktests
+INSTALLED_TESTS := $(dir $(LOCAL_INSTALLED_MODULE))../cts_dalviktests/timestamp
-$(LOCAL_INSTALLED_MODULE): $(INSTALLED_TESTS)
+$(LOCAL_BUILT_MODULE): $(INSTALLED_TESTS)
$(INSTALLED_TESTS): PRIVATE_INTERMEDIATES := $(intermediates)/tests
$(INSTALLED_TESTS): $(GENERATED_FILES) $(GENERATED_FILES)/dot/junit/dexcore.jar
- $(hide) mkdir -p $@/tests
- $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/dot $@/tests
- $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/data $@/
+ $(hide) mkdir -p $(dir $@)tests
+ $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/dot $(dir $@)tests
+ $(hide) $(ACP) -r $(PRIVATE_INTERMEDIATES)/data $(dir $@)
+ @touch $@
$(intermediates)/android.core.vm-tests.jar: PRIVATE_INTERMEDIATES := $(intermediates)
$(intermediates)/android.core.vm-tests.jar: $(INSTALLED_TESTS)
