Snap for 7098088 from 5819393ca04902c8fea8f07062d7e38f76aa36c5 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: If46388180b1e788cbe5bed325cf9599df12d3cbb

1 files changed, 13 insertions, 10 deletions

diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh
index dc4b4e7..a11fa5c 100644
--- a/scripts/repackage-common.sh
+++ b/scripts/repackage-common.sh
@@ -96,18 +96,18 @@ set -e
 CLASSPATH=${ANDROID_HOST_OUT}/framework/currysrc.jar
 CHANGE_LOG=$(mktemp --suffix srcgen-change.log)
 
-function get_uncommitted_repackaged_files() {
-  git -C "${PROJECT_DIR}" status -s | cut -c4- | grep "^repackaged/"
-}
-
 cd ${ANDROID_BUILD_TOP}
 build/soong/soong_ui.bash --make-mode currysrc
 
-DEFAULT_CONSTRUCTORS_FILE=${PROJECT_DIR}/srcgen/default-constructors.txt
-CORE_PLATFORM_API_FILE=${PROJECT_DIR}/srcgen/core-platform-api.txt
-STABLE_CORE_PLATFORM_API_FILE=${PROJECT_DIR}/srcgen/stable-core-platform-api.txt
-INTRA_CORE_API_FILE=${PROJECT_DIR}/srcgen/intra-core-api.txt
-UNSUPPORTED_APP_USAGE_FILE=${PROJECT_DIR}/srcgen/unsupported-app-usage.json
+if [[ -z "${SRCGEN_DIR}" ]]; then
+  SRCGEN_DIR=${PROJECT_DIR}/srcgen
+fi
+
+DEFAULT_CONSTRUCTORS_FILE=${SRCGEN_DIR}/default-constructors.txt
+CORE_PLATFORM_API_FILE=${SRCGEN_DIR}/core-platform-api.txt
+STABLE_CORE_PLATFORM_API_FILE=${SRCGEN_DIR}/stable-core-platform-api.txt
+INTRA_CORE_API_FILE=${SRCGEN_DIR}/intra-core-api.txt
+UNSUPPORTED_APP_USAGE_FILE=${SRCGEN_DIR}/unsupported-app-usage.json
 
 TAB_SIZE=${TAB_SIZE-4}
 
@@ -175,7 +175,10 @@ function do_transform() {
   (cd $SRC_OUT_DIR; git checkout HEAD $(git status --short | grep -E "^ D .*/TEST_MAPPING$" | cut -c4-))
 }
 
-REPACKAGED_DIR=${PROJECT_DIR}/repackaged
+if [[ -z "${REPACKAGED_DIR}" ]]; then
+  REPACKAGED_DIR=${PROJECT_DIR}/repackaged
+fi
+
 for i in ${MODULE_DIRS}
 do
   MODULE_DIR=${PROJECT_DIR}/${i}