diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:09:43 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:09:43 +0000 |
commit | c66c70b5a52253c6df29728ba3e5eb73072f6575 (patch) | |
tree | 580c2914b0561c1b2c40eb0c2f29163e9bd7bbb1 | |
parent | faa13ba30d3ecaaf56b7c3b0fd68658a4eea090e (diff) | |
parent | 5819393ca04902c8fea8f07062d7e38f76aa36c5 (diff) | |
download | currysrc-android12-mainline-resolv-release.tar.gz |
Snap for 7550930 from 5819393ca04902c8fea8f07062d7e38f76aa36c5 to mainline-resolv-releaseandroid-mainline-12.0.0_r94android-mainline-12.0.0_r80android-mainline-12.0.0_r65android-mainline-12.0.0_r52android-mainline-12.0.0_r35android-mainline-12.0.0_r16android-mainline-12.0.0_r124android-mainline-12.0.0_r108aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_res_331820000aml_res_331611010aml_res_331512000aml_res_331314010aml_res_331114000aml_res_331011050aml_res_330910000aml_res_330810000android14-mainline-resolv-releaseandroid13-mainline-resolv-releaseandroid12-mainline-resolv-release
Change-Id: Id1928e9d86a01ca9d66e4709e4ca35fb5ae2fb36
-rw-r--r-- | scripts/repackage-common.sh | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh index 5f1e058..a11fa5c 100644 --- a/scripts/repackage-common.sh +++ b/scripts/repackage-common.sh @@ -96,17 +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 -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} @@ -130,6 +131,12 @@ if [[ -f "${CORE_PLATFORM_API_FILE}" ]]; then SEP=" " fi +if [[ -f "${STABLE_CORE_PLATFORM_API_FILE}" ]]; then + echo "Adding CorePlatformApi(status=STABLE) annotations from ${STABLE_CORE_PLATFORM_API_FILE}" + REPACKAGE_ARGS="${REPACKAGE_ARGS}${SEP}--stable-core-platform-api-file ${STABLE_CORE_PLATFORM_API_FILE}" + SEP=" " +fi + if [[ -f "${INTRA_CORE_API_FILE}" ]]; then echo "Adding IntraCoreApi annotations from ${INTRA_CORE_API_FILE}" REPACKAGE_ARGS="${REPACKAGE_ARGS}${SEP}--intra-core-api-file ${INTRA_CORE_API_FILE}" @@ -168,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} @@ -217,6 +227,12 @@ if [[ -f "${CORE_PLATFORM_API_FILE}" ]]; then "CorePlatformApi annotations were not added at the following locations from ${CORE_PLATFORM_API_FILE}:" fi +if [[ -f "${STABLE_CORE_PLATFORM_API_FILE}" ]]; then + # Check to ensure that all the requested annotations were added. + checkChangeLog <(sort -u "${STABLE_CORE_PLATFORM_API_FILE}" | grep -v '^#') "@libcore.api.CorePlatformApi" \ + "CorePlatformApi annotations were not added at the following locations from ${STABLE_CORE_PLATFORM_API_FILE}:" +fi + if [[ -f "${INTRA_CORE_API_FILE}" ]]; then # Check to ensure that all the requested annotations were added. checkChangeLog <(sort -u "${INTRA_CORE_API_FILE}" | grep -v '^#') "@libcore.api.IntraCoreApi" \ |