diff options
| author | Daulet Zhanguzin <dauletz@google.com> | 2021-01-22 11:21:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-22 11:21:19 +0000 |
| commit | e7290b44c9974bf9786f230f0c90c4d795454287 (patch) | |
| tree | 580c2914b0561c1b2c40eb0c2f29163e9bd7bbb1 | |
| parent | 63d01f3189c5f70a6fc52d1bd60bf7593ff06721 (diff) | |
| parent | 0ed3bdf3d47ecc411dbf77a9b79827b885f6ad74 (diff) | |
| download | currysrc-e7290b44c9974bf9786f230f0c90c4d795454287.tar.gz | |
Merge "Allow currysrc users to override srcgen and output directories" am: 0ed3bdf3d4android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1555397
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbe7500c428f0f3a09a79c459ca5c338d209ddac
| -rw-r--r-- | scripts/repackage-common.sh | 23 |
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} |