Mesa (staging/21.2): AOSP: Update timestamps of target binaries

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: b8ec9da966ad698e7a9fff106892b2c004f6516a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8ec9da966ad698e7a9fff106892b2c004f6516a

Author: Roman Stratiienko <r.stratiienko at gmail.com>
Date:   Tue Aug 10 20:22:36 2021 +0300

AOSP: Update timestamps of target binaries

Fixes warning during the build and unnecessary rule execution:
***
ninja: Missing `restat`? An output file is older than the most recent input:
***

Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson")
Signed-off-by: Roman Stratiienko <r.stratiienko at gmail.com>
Tested-by: Mauro Rossi <issor.oruam at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12304>
(cherry picked from commit 21de785562b05ec08252b0e16634a125646faa63)

---

 .pick_status.json       | 2 +-
 android/mesa3d_cross.mk | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c77a97d88af..12f76dda1ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -265,7 +265,7 @@
         "description": "AOSP: Update timestamps of target binaries",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8621bd8d5e67173281c6a6dd64054d4b0366f023"
     },
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index da63cc9393f..fcb4d938f42 100644
--- a/android/mesa3d_cross.mk
+++ b/android/mesa3d_cross.mk
@@ -272,12 +272,13 @@ $(MESON_OUT_DIR)/install/.install.timestamp: $(MESON_OUT_DIR)/.build.timestamp
 	touch $@
 
 $($(M_TARGET_PREFIX)MESA3D_LIBGBM_BIN) $(MESA3D_GLES_BINS): $(MESON_OUT_DIR)/install/.install.timestamp
-	echo "Build $@"\
+	echo "Build $@"
+	touch $@
 
 define vulkan_target
 $(M_TARGET_PREFIX)MESA3D_VULKAN_$1_BIN := $(MESON_OUT_DIR)/install/usr/local/lib/libvulkan_$(MESA_VK_LIB_SUFFIX_$1).so
 $(MESON_OUT_DIR)/install/usr/local/lib/libvulkan_$(MESA_VK_LIB_SUFFIX_$1).so: $(MESON_OUT_DIR)/install/.install.timestamp
-	echo $@
+	touch $(MESON_OUT_DIR)/install/usr/local/lib/libvulkan_$(MESA_VK_LIB_SUFFIX_$1).so
 
 endef
 
@@ -292,3 +293,4 @@ $($(M_TARGET_PREFIX)TARGET_OUT_VENDOR_SHARED_LIBRARIES)/dri/.symlinks.timestamp:
 
 $($(M_TARGET_PREFIX)MESA3D_GALLIUM_DRI_BIN): $(TARGET_OUT_VENDOR)/$(MESA3D_LIB_DIR)/dri/.symlinks.timestamp
 	echo "Build $@"
+	touch $@