commit eecbf2160f6c6a5fa95670dff0d901c521c24ccb
author Guojing Yuan <guojing@google.com> Wed Oct 11 00:15:53 2023 +0000
committer Guojing Yuan <guojing@google.com> Wed Oct 11 00:16:52 2023 +0000
tree 6ebf91bba4448c7ebfcda7a0de21519bbdd78b44
parent c00a4c0a2ccc7f010de679546c9735cd42d0ef24

[CDM] Setup trunk stable flagging

Bug: 193583135
Bug: 304478316

Test: m build
Change-Id: I08a835e2ae6724970c8aa99930ad0af913b6625a

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 864caf4..2e71d83 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -14,6 +14,7 @@
 
 aconfig_srcjars = [
     ":android.app.usage.flags-aconfig-java{.generated_srcjars}",
+    ":android.companion.flags-aconfig-java{.generated_srcjars}",
     ":android.content.pm.flags-aconfig-java{.generated_srcjars}",
     ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",
     ":android.nfc.flags-aconfig-java{.generated_srcjars}",
@@ -429,7 +430,7 @@
     package: "android.service.autofill",
     srcs: [
         "services/autofill/bugfixes.aconfig",
-        "services/autofill/features.aconfig"
+        "services/autofill/features.aconfig",
     ],
 }
 
@@ -438,3 +439,16 @@
     aconfig_declarations: "android.service.autofill.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// Companion
+aconfig_declarations {
+    name: "android.companion.flags-aconfig",
+    package: "android.companion",
+    srcs: ["core/java/android/companion/*.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.companion.flags-aconfig-java",
+    aconfig_declarations: "android.companion.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}