Merge "Allow currysrc users to override srcgen and output directories" am: 0ed3bdf3d4 am: e7290b44c9 am: c39f198ad4
Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1555397
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5899998471ff5c1fa36a1a5c05e7ffd77a91f1c
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 @@
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 @@
(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}
