aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-05-09 22:22:59 -0700
committerColin Cross <ccross@android.com>2018-05-10 14:30:53 +0000
commit3cce3b15a19de77203336aedfda490371348f38d (patch)
tree0c73429fa1dfd38a75be6a825d0549f039661dd1
parent81f38d8b0a959658f267f169c18d95466a97d587 (diff)
downloadrobolectric-pie-qpr1-s3-release.tar.gz
classes-with-res.jar uses commit-change-for-toc, which only updates the output file if it has changed, but the rule is not marked as restat. This causes ninja to assume the file was rebuilt for the current run, but on the next run it sees the old timestamp and thinks it is dirty. Mark the rule as restat in ninja with .KATI_RESTAT. Bug: 79504400 Test: m java && m java Change-Id: I09be19d05301418850f58eb24094e342109ca3e6 Merged-In: I09be19d05301418850f58eb24094e342109ca3e6 (cherry picked from commit 5837fa0f14e0b59bdf4777800c4083f382e68c52)
-rw-r--r--include_framework_res.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/include_framework_res.mk b/include_framework_res.mk
index 09dde5809..07cf67cb3 100644
--- a/include_framework_res.mk
+++ b/include_framework_res.mk
@@ -19,6 +19,7 @@ $(robo_full_target): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package)
$(robo_full_target): PRIVATE_CLASS_INTERMEDIATES_DIR := $(robo_classes_dir)
+.KATI_RESTAT: $(robo_full_target)
$(robo_full_target): $(framework_res_package) $(robo_input_jar) $(ZIPTIME)
@echo Adding framework resources: $@
$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)