commit 77319acc5b42314ebae78c35bd99c11652420222
author Pete Gillin <peteg@google.com> Mon Jun 15 08:59:57 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 15 08:59:57 2020 +0000
tree 17976eefb1a4eaf3ca677a8382a00b9c4545b6ce
parent faa13ba30d3ecaaf56b7c3b0fd68658a4eea090e
parent 63d01f3189c5f70a6fc52d1bd60bf7593ff06721

Update currysrc to support stable core/platform API. am: 7074dfcc06 am: 6a4ae9b82c am: cd7215e355 am: a71da3da07 am: 63d01f3189

Original change: https://android-review.googlesource.com/c/platform/tools/currysrc/+/1331085

Change-Id: I1bbb7c27e778b6a4416f1e118a856528bc3f8b88

scripts/repackage-common.sh

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 @@
 
 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 @@
   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 @@
       "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" \