From c06f48a21d8dcd6dc5e2c8c91c0eaed32b8bd50d Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 2 Jul 2018 11:06:19 +0100 Subject: [PATCH] Fix unzip on sdk_mac build Recent CL added a flag to an unzip command which does not restore the timestamps of extracted files. This is necessary because the extracted files are the output of the rule and thus the timestamp must be newer than the timestamp of the inputs. Unfortunately, the sdk_mac build has an old version of UnZip (5.52 vs 6.0) which does not support the flag. Replace it with find|touch. Test: m Change-Id: Ib1f218af4547a1d604b46e68b6ef50d45cb91ee9 --- core/definitions.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index 02fc77a002..857b73c72c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2859,7 +2859,8 @@ define hiddenapi-copy-soong-jar $(call hiddenapi-soong-input-dex,$(2)): $(1) @rm -rf `dirname $$@` @mkdir -p `dirname $$@` - unzip -o -DD -q $(1) 'classes*.dex' -d `dirname $$@` + unzip -o -q $(1) 'classes*.dex' -d `dirname $$@` + find `dirname $$@` -maxdepth 1 -name 'classes*.dex' | xargs touch $(call hiddenapi-copy-dex-files,\ $(call hiddenapi-soong-input-dex,$(2)),\