Update vndk snapshot script
Add the last version of VNDK snapshot.
Bug: 444161455
Test: m com.android.vndk.v34
Change-Id: I9e5d4a0e0073c8dea6e1b93572d42de18aed9371
diff --git a/vndk/snapshot/gen_buildfiles.py b/vndk/snapshot/gen_buildfiles.py
index 4cbdec8..0b7ffcf 100644
--- a/vndk/snapshot/gen_buildfiles.py
+++ b/vndk/snapshot/gen_buildfiles.py
@@ -637,7 +637,7 @@
def rename_generated_dirs(dirs):
# Rename out/soong/.intermediates to generated-headers for better readability.
- return [d.replace(utils.SOONG_INTERMEDIATES_DIR, utils.GENERATED_HEADERS_DIR, 1) for d in dirs]
+ return sorted(set([d.replace(utils.SOONG_INTERMEDIATES_DIR, utils.GENERATED_HEADERS_DIR, 1) for d in dirs]))
for src in sorted(srcs_props.keys()):
include_dirs = ''
diff --git a/vndk/snapshot/multi_update.py b/vndk/snapshot/multi_update.py
index d2589b1..dfc47b9 100644
--- a/vndk/snapshot/multi_update.py
+++ b/vndk/snapshot/multi_update.py
@@ -22,11 +22,11 @@
import utils
VNDK_SNAPSHOT_SOURCE_BRANCHES = {
- 29: 'qt-gsi-release',
30: 'android11-gsi',
31: 'android12-gsi',
32: 'android12L-gsi',
33: 'android13-gsi',
+ 34: 'android14-gsi',
}
def fetch_and_update_snapshots(versions, args):
@@ -57,9 +57,9 @@
help='Perform the update in the current branch. Do not repo start.')
parser.add_argument(
'--remote',
- default='aosp',
+ default='goog',
help=('Remote name to fetch and check if the revision of VNDK snapshot '
- 'is included in the source to conform GPL license. default=aosp'))
+ 'is included in the source to conform GPL license. default=goog'))
parser.add_argument(
'-v',
'--verbose',
