commit 607c61b071904e5881719b49da84c9bcb0270343
author Kholoud Mohamed <kholoudm@google.com> Mon Oct 16 13:49:14 2023 +0000
committer Kholoud Mohamed <kholoudm@google.com> Wed Oct 18 09:19:41 2023 +0000
tree 8bc9abbdbab01b3f95140bb6ac485299c2d5ead0
parent 167941f3f9359b59599ab450d63aaf8259792755

Move device policy flag definitions client side

And flagged a testAPI constant that wasn't flagged

Bug: 304478555
Test: Build succeeds
Change-Id: If36f52cf3e8db4638b5c9eb08df9d3a44ef4a625

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 6d74a84..1c9785f 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -51,6 +51,7 @@
     ":aconfig_midi_flags_java_lib{.generated_srcjars}",
     ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
     ":com.android.net.flags-aconfig-java{.generated_srcjars}",
+    ":device_policy_aconfig_flags_lib{.generated_srcjars}",
 ]
 
 filegroup {
@@ -523,3 +524,23 @@
     aconfig_declarations: "com.android.net.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// DevicePolicy
+aconfig_declarations {
+    name: "device_policy_aconfig_flags",
+    package: "android.app.admin.flags",
+    srcs: [
+        "core/java/android/app/admin/flags/flags.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "device_policy_aconfig_flags_lib",
+    aconfig_declarations: "device_policy_aconfig_flags",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+    name: "device_policy_aconfig_flags_c_lib",
+    aconfig_declarations: "device_policy_aconfig_flags",
+}