commit d3c353fb988e569901c72b64608842d8e5a48f64
author Yan Yan <evitayan@google.com> Wed Oct 25 01:55:01 2023 +0000
committer Yan Yan <evitayan@google.com> Thu Oct 26 01:31:49 2023 +0000
tree 30e8086fafe3e927d9185eadc84517d9987ebd00
parent 5402a800e09c8d0affa8bbc9d423de4c2cbb5b31

Add a flag for VCN safe mode configurability

Add aconfig for VCN feature flags and the flag for VCN
safe mode configurability

Bug: 276358140
Test: verified flags are accessible
Change-Id: I4a54445a4238c81a409604be16c90ef341eed638
Merged-In: I4a54445a4238c81a409604be16c90ef341eed638

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index f0e0c30..8156900 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -15,6 +15,7 @@
 aconfig_srcjars = [
     ":android.content.pm.flags-aconfig-java{.generated_srcjars}",
     ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
+    ":android.net.vcn.flags-aconfig-java{.generated_srcjars}",
     ":android.nfc.flags-aconfig-java{.generated_srcjars}",
     ":android.os.flags-aconfig-java{.generated_srcjars}",
     ":android.security.flags-aconfig-java{.generated_srcjars}",
@@ -186,3 +187,16 @@
     aconfig_declarations: "com.android.net.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// VCN
+aconfig_declarations {
+    name: "android.net.vcn.flags-aconfig",
+    package: "android.net.vcn",
+    srcs: ["core/java/android/net/vcn/*.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.net.vcn.flags-aconfig-java",
+    aconfig_declarations: "android.net.vcn.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}