From ed37595aaf8dc284f682f8d8ecface6b07662e33 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Tue, 23 Apr 2024 19:38:55 +0000 Subject: [PATCH] Update sdk finalizer to change soong instead of bazel Update the map in soong instead of that in bazel Bug: 315353489 Test: manual Merged-In: I3a51be1119109d2a6cf3959bdc8a48192872580f Change-Id: Ia61a17be4a7d85c00d2e9758ea2409019d451dfd --- tools/finalization/finalize-aidl-vndk-sdk-resources.sh | 6 +++--- 1 file 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