commit 0806cabac024c03d9cbf5500132d71071243c186
author Nikita Ioffe <ioffe@google.com> Wed Apr 10 14:46:47 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 14:46:47 2024 +0000
tree 1d76bba7bf34c02e9ae676c9a222440807a85df5
parent 162ddbb8335fd0bad52fabddba9b14e9f20d6d07
parent 40a35c8433dade14b8a703d98657580c032a8462

Merge "Use android15-6.6 microdroid kernel in trunk" into main

build_config/trunk.scl

diff --git a/build_config/trunk.scl b/build_config/trunk.scl
index 689bbb9..3a29a8c 100644
--- a/build_config/trunk.scl
+++ b/build_config/trunk.scl
@@ -43,6 +43,7 @@
     value("RELEASE_DEPRECATE_VNDK", True),
     value("RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION", "2.042"),
     value("RELEASE_PACKAGE_HENTAIGANA_FONT", True),
+    value("RELEASE_PACKAGE_LIBSQLITE3", "3440300"),
     value("RELEASE_PACKAGE_TZDATA_MODULE", "com.android.tzdata"),
     value("RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK", True),
     value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),

build_config/trunk_staging.scl

diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
index ef28987..bd31b6c 100644
--- a/build_config/trunk_staging.scl
+++ b/build_config/trunk_staging.scl
@@ -36,6 +36,7 @@
     value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True),
     value("RELEASE_AVF_ENABLE_VIRT_CPUFREQ", True),
     value("RELEASE_AVF_MICRODROID_KERNEL_VERSION", "android15_66"),
+    value("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES", True),
     value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True),
     value("RELEASE_BOARD_API_LEVEL", "202504"),
     value("RELEASE_CREATE_ACONFIG_STORAGE_FILE", True),
@@ -55,6 +56,7 @@
     value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
     value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
     value("RELEASE_SELINUX_DATA_DATA_IGNORE", True),
+    value("RELEASE_UNLOCKED_STORAGE_API", True),
     # keep-sorted end
 ]
 # Flags should be alphabetical by flag name to reduce merge conflifcts

build_flags.scl

diff --git a/build_flags.scl b/build_flags.scl
index 7584ee2..96dad3c 100644
--- a/build_flags.scl
+++ b/build_flags.scl
@@ -81,6 +81,9 @@
     # Specify which Microdroid kernel version to use for Microdroid VMs.
     flag("RELEASE_AVF_MICRODROID_KERNEL_VERSION", SYSTEM, None),
 
+    # Enable running custom VMs with paravirtualized devices.
+    flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES", ALL, False),
+
     # If enabled, DeathRecipient is not strongly referenced from JNI.
     flag("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", ALL, False),
 
@@ -207,6 +210,9 @@
     # feature flag for a new API to open declared passthrough HAL
     flag("RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL", ALL, False),
 
+    # flag to enable the unlocked-only storage API's SEPolicy rules
+    flag("RELEASE_UNLOCKED_STORAGE_API", ALL, False),
+
     # feature flag for enabling use_resource_processor: true by default
     flag("RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT", ALL, False),