summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-16 23:44:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-16 23:44:39 +0000
commit68eda34f4b5bd1c6ba1379b543b8eb8e5d649901 (patch)
tree6e01c3fe79bc0450f56def1582e2de10032eed11
parentb03febf708fab6ac4b8dd4e29187747341561ad4 (diff)
parent0158d04678a9b7bbb971214d77e299e9a1219043 (diff)
downloadrelease-main.tar.gz
Merge "Introduce a new build flag RELEASE_AVF_ENABLE_NETWORK" into mainHEADmastermain
-rw-r--r--build_config/trunk_staging.scl1
-rw-r--r--build_flags.scl3
-rw-r--r--flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto8
-rw-r--r--flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto4
4 files changed, 16 insertions, 0 deletions
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
index dfcf02e..54e6491 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 44fc4f2..db033aa 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 0000000..1fbac45
--- /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 0000000..2594a9f
--- /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
+}