diff options
| author | Pete Gillin <peteg@google.com> | 2020-06-12 13:10:19 +0100 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2020-06-12 14:33:53 +0100 |
| commit | 7074dfcc06d5e89a0980885c6955124edbb946fc (patch) | |
| tree | 17976eefb1a4eaf3ca677a8382a00b9c4545b6ce | |
| parent | ee58ce6a1931a4410059f2651d7e444bb8df35dc (diff) | |
| download | currysrc-7074dfcc06d5e89a0980885c6955124edbb946fc.tar.gz | |
Update currysrc to support stable core/platform API.android-r-beta-3android-r-beta-2
This change allows you to specify a flat file to add
@CorePlatformApi(status=STABLE) to (previously it only supported bare
@CorePlatformApi). This would have been possible using the JSON format
before, but this would be more verbose and error-prone in the case (as
with conscrypt) where the whole surface is stable.
Test: external/conscrypt/srcgen/generate_android_src.sh (and check result)
Bug: 157640067
Change-Id: Ie69e2805ed6c76cde395e48532236fdd31bb0c67
| -rw-r--r-- | scripts/repackage-common.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh index 5f1e058..dc4b4e7 100644 --- a/scripts/repackage-common.sh +++ b/scripts/repackage-common.sh @@ -105,6 +105,7 @@ 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 @@ -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}" @@ -217,6 +224,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" \ |