From a9b025d1532f41657d7be812e113c10faeb38250 Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Wed, 20 Jan 2021 18:32:18 +0000 Subject: Allow currysrc users to override srcgen and output directories Bug: 154796679 Test: run the generation with and without new parameters Change-Id: I9449d82d6aef14feef53c0049f5ac3ccc4ef6b8f --- scripts/repackage-common.sh | 23 +++++++++++++---------- 1 file 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} -- cgit v1.2.3