diff options
| author | 2024-05-16 23:58:08 +0000 | |
|---|---|---|
| committer | 2024-05-16 23:58:08 +0000 | |
| commit | 98e1f68cc53cc7dd4788c29cb7f35ee967a21aa1 (patch) | |
| tree | e0acee181beae7f6b1798ad19206ffa885b125ad | |
| parent | 769fd778c2eb166a27f3bb1fd0a770afe1f9654a (diff) | |
| parent | 68eda34f4b5bd1c6ba1379b543b8eb8e5d649901 (diff) | |
Merge "Introduce a new build flag RELEASE_AVF_ENABLE_NETWORK" into main am: 68eda34f4b
Original change: https://android-review.googlesource.com/c/platform/build/release/+/3081097
Change-Id: I64953f2ab8d9c116e12394bc46a38aa34ed3fdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | build_config/trunk_staging.scl | 1 | ||||
| -rw-r--r-- | build_flags.scl | 3 | ||||
| -rw-r--r-- | flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto | 8 | ||||
| -rw-r--r-- | flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl index 954bc93b..ff00cbea 100644 --- a/build_config/trunk_staging.scl +++ b/build_config/trunk_staging.scl @@ -33,6 +33,7 @@ values = [ value("RELEASE_AVF_ENABLE_DICE_CHANGES", True), value("RELEASE_AVF_ENABLE_LLPVM_CHANGES", True), value("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", True), + value("RELEASE_AVF_ENABLE_NETWORK", True), value("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", True), value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True), value("RELEASE_AVF_ENABLE_VIRT_CPUFREQ", True), diff --git a/build_flags.scl b/build_flags.scl index 6a3cde40..e58ae242 100644 --- a/build_flags.scl +++ b/build_flags.scl @@ -69,6 +69,9 @@ flags = [ # Enables running multiple payloads in the same Microdroid VM instance. flag("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", SYSTEM, False), + # Adds supports for network functionality in VMs. + flag("RELEASE_AVF_ENABLE_NETWORK", SYSTEM, False), + # Enables pVM remote attestation in Microdroid VM. flag("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", ALL, False), diff --git a/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto new file mode 100644 index 00000000..1fbac459 --- /dev/null +++ b/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto @@ -0,0 +1,8 @@ +name: "RELEASE_AVF_ENABLE_NETWORK" +namespace: "android_UNKNOWN" +description: "Adds supports for network functionality in VMs." +value: { + bool_value: false +} +workflow: LAUNCH +containers: "system" diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto new file mode 100644 index 00000000..2594a9fe --- /dev/null +++ b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto @@ -0,0 +1,4 @@ +name: "RELEASE_AVF_ENABLE_NETWORK" +value: { + bool_value: true +} |