diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-23 20:26:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-23 20:26:05 +0000 |
| commit | 6974bbf7eecc6763e5e2cbbbaa84bac6f3bf0170 (patch) | |
| tree | 8e0e79bf1f0133c5fb3772aa452183be9973ac0f | |
| parent | 59274f816c13418496f76e094719650ab557b9a7 (diff) | |
| parent | ed37595aaf8dc284f682f8d8ecface6b07662e33 (diff) | |
| download | build-6974bbf7eecc6763e5e2cbbbaa84bac6f3bf0170.tar.gz | |
Merge "Update sdk finalizer to change soong instead of bazel" into main
| -rwxr-xr-x | tools/finalization/finalize-aidl-vndk-sdk-resources.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh index 671b036e60..75379ff661 100755 --- a/tools/finalization/finalize-aidl-vndk-sdk-resources.sh +++ b/tools/finalization/finalize-aidl-vndk-sdk-resources.sh @@ -133,10 +133,10 @@ function finalize_aidl_vndk_sdk_resources() { sed -i -e "s/sepolicy_major_vers := .*/sepolicy_major_vers := ${FINAL_PLATFORM_SDK_VERSION}/g" "$top/build/make/core/config.mk" cp "$top/build/make/target/product/gsi/current.txt" "$top/build/make/target/product/gsi/$FINAL_PLATFORM_SDK_VERSION.txt" - # build/bazel + # build/soong local codename_version="\"${FINAL_PLATFORM_CODENAME}\": ${FINAL_PLATFORM_SDK_VERSION}" - if ! grep -q "$codename_version" "$top/build/bazel/rules/common/api_constants.bzl" ; then - sed -i -e "/:.*$((${FINAL_PLATFORM_SDK_VERSION}-1)),/a \\ $codename_version," "$top/build/bazel/rules/common/api_constants.bzl" + if ! grep -q "$codename_version" "$top/build/soong/android/api_levels.go" ; then + sed -i -e "/:.*$((${FINAL_PLATFORM_SDK_VERSION}-1)),/a \\\t\t$codename_version," "$top/build/soong/android/api_levels.go" fi # cts |