diff options
| -rw-r--r-- | build_config/trunk.scl | 1 | ||||
| -rw-r--r-- | build_config/trunk_staging.scl | 2 | ||||
| -rw-r--r-- | build_flags.scl | 6 |
3 files changed, 9 insertions, 0 deletions
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 @@ values = [ 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"), 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 @@ values = [ 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 @@ values = [ 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 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 @@ flags = [ # 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 @@ flags = [ # 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), |