From ca4ad86d20aec63e4c909c53030705fc11355154 Mon Sep 17 00:00:00 2001
From: Dennis Shen <dzshen@google.com>
Date: Wed, 11 Jun 2025 23:11:42 +0000
Subject: [PATCH] Add end to end mainline beta test flag in connectivity module

These are dummy no op test flags meant for testing mainline beta
flagging and workflow infras. Will remove them once the test has
completed.

Bug: b/406508072
Test: m and verify in AVD
Flag: EXEMPT build system changes
Change-Id: I3d9326bce2ca0b7b8a61405a88565a1a7674c4db
---
 Tethering/Android.bp                         |  1 +
 common/Android.bp                            | 17 +++++++++++++++++
 common/mainline_beta_end_to_end_test.aconfig | 17 +++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 common/mainline_beta_end_to_end_test.aconfig

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 091849ba26..2a39028318 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -65,6 +65,7 @@ java_defaults {
         "androidx.annotation_annotation",
         "connectivity-net-module-utils-bpf",
         "com.android.net.flags-aconfig-java",
+        "com.android.tethering.beta.test.flags-aconfig-java",
         "modules-utils-build",
         "modules-utils-statemachine",
         "networkstack-client",
diff --git a/common/Android.bp b/common/Android.bp
index acd2349bc9..41ced61f6c 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -20,6 +20,23 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+aconfig_declarations {
+    name: "tethering.beta.test.flags",
+    package: "com.android.tethering.beta.test",
+    container: "com.android.tethering",
+    srcs: ["mainline_beta_end_to_end_test.aconfig"],
+}
+
+java_aconfig_library {
+    name: "com.android.tethering.beta.test.flags-aconfig-java",
+    aconfig_declarations: "tethering.beta.test.flags",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+    ],
+}
+
 aconfig_declarations {
     name: "com.android.net.flags-aconfig",
     package: "com.android.net.flags",
diff --git a/common/mainline_beta_end_to_end_test.aconfig b/common/mainline_beta_end_to_end_test.aconfig
new file mode 100644
index 0000000000..453141c645
--- /dev/null
+++ b/common/mainline_beta_end_to_end_test.aconfig
@@ -0,0 +1,17 @@
+package: "com.android.tethering.beta.test"
+container: "com.android.tethering"
+
+flag {
+    name: "beta_end_to_end_test_rw_flag"
+    namespace: "com_android_tethering"
+    description: "mainline beta RW end to end test flag"
+    bug: "123456789"
+}
+
+flag {
+    name: "beta_end_to_end_test_fixed_ro_flag"
+    namespace: "com_android_tethering"
+    description: "mainline beta fixed RO end to end test flag"
+    is_fixed_read_only: true
+    bug: "123456789"
+}