summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-09-19 11:03:41 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-19 11:03:41 -0700
commit3ede4fb7d6fea01937f70dd5fecb48e47633661d (patch)
treef8c2c62094e102fa8e3922e1702a31fc35e0dcfb
parentc9b9e04586a0edd2b8a833832a36cd1edc0762c0 (diff)
parent7c37827127c045df01687c529dc86186d88b0a73 (diff)
downloadcurrysrc-3ede4fb7d6fea01937f70dd5fecb48e47633661d.tar.gz
Restore TEST_MAPPING files removed during repackaging am: 51931e2522 am: 9fd111d6eb am: b4db485d2d
am: 7c37827127 Change-Id: I33101a3d51c9e7d50952e535d46d1aef357665cf
-rw-r--r--scripts/repackage-common.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh
index 23985b2..94af157 100644
--- a/scripts/repackage-common.sh
+++ b/scripts/repackage-common.sh
@@ -163,6 +163,9 @@ function do_transform() {
--target-dir ${SRC_OUT_DIR} \
--change-log ${CHANGE_LOG} \
${REPACKAGE_ARGS}
+
+ # Restore TEST_MAPPING files that may have been removed from the source directory
+ (cd $SRC_OUT_DIR; git checkout HEAD $(git status --short | grep -E "^ D .*/TEST_MAPPING$" | cut -c4-))
}
REPACKAGED_DIR=${PROJECT_DIR}/repackaged