summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-09-19 10:56:44 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-19 10:56:44 -0700
commit7c37827127c045df01687c529dc86186d88b0a73 (patch)
treef8c2c62094e102fa8e3922e1702a31fc35e0dcfb
parent589fccd3d0fef0b0e3e0dfe65aea8afe87892819 (diff)
parentb4db485d2d739c7ec4aa4a59ccfae377381ac981 (diff)
downloadcurrysrc-7c37827127c045df01687c529dc86186d88b0a73.tar.gz
Restore TEST_MAPPING files removed during repackaging am: 51931e2522 am: 9fd111d6eb
am: b4db485d2d Change-Id: Ib51ba2a7a5e02ee9f5211c16913af5edede48e15
-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