commit 3cdf392f610e415127c12b3c3b063c9aafd9b186
author Xin Li <delphij@google.com> Fri Dec 09 10:23:02 2022 -0800
committer Xin Li <delphij@google.com> Fri Dec 09 10:23:02 2022 -0800
tree ed1917e6d6abad34ef8aa941a40328e5aeed89f7
parent e4c493a3ada2d458af7e236087ce4dc7b7a9b5f9
parent 4a134c38b2fc62089f725fc0c6f105cd0b51fce6

Merge Android 13 QPR1

Bug: 261731544
Merged-In: Idccbf36672703b1e9a6b27bf117459284bc7ed26
Change-Id: I3c0651138a35d0ec3289be1b0e6873bba57593b4

finalize-sdk-rel.sh

diff --git a/finalize-sdk-rel.sh b/finalize-sdk-rel.sh
index a74a94a..35899f7 100755
--- a/finalize-sdk-rel.sh
+++ b/finalize-sdk-rel.sh
@@ -29,13 +29,13 @@
     cp -r "$DEV_SRC_DIR/system/sepolicy/private/" "$DEV_SRC_DIR/system/sepolicy/prebuilts/api/${PLATFORM_SDK_VERSION}.0/"
 
     # prebuilts/abi-dumps/ndk
-    git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk" mv ${PLATFORM_CODENAME} ${PLATFORM_SDK_VERSION}
+    git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk" mv current ${PLATFORM_SDK_VERSION}
 
     # prebuilts/abi-dumps/vndk
     git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk" mv ${PLATFORM_CODENAME} ${PLATFORM_SDK_VERSION}
 
     # prebuilts/abi-dumps/platform
-    git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/platform" mv ${PLATFORM_CODENAME} ${PLATFORM_SDK_VERSION}
+    git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/platform" mv current ${PLATFORM_SDK_VERSION}
 }
 
 finalize_sdk_rel

target/product/gsi/current.txt

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index aaeee93..474cb20 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -21,7 +21,7 @@
 LLNDK: libvulkan.so
 VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk.so
-VNDK-SP: android.hardware.graphics.common-V3-ndk.so
+VNDK-SP: android.hardware.graphics.common-V4-ndk.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
 VNDK-SP: android.hardware.graphics.common@1.2.so