commit c1dc96ad0046fa247087ec04cf66219073fb7681
author Darrell Shi <darrellshi@google.com> Thu Oct 12 17:16:04 2023 +0000
committer Darrell Shi <darrellshi@google.com> Thu Oct 12 23:39:46 2023 +0000
tree 45bb233356f7b4249c321bd7ba5fb163a7c5b79b
parent 5599a08300862088a918b7853a8d9feda901efa0

Update communal aconfig package to systemui

Bug: 304584416
Bug: 304585752
Test: compiles
Change-Id: Ic9746290cf5e0264bbf7cb2fd005a61021a168ee

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index f65f5a3..1a33b6e3 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -164,7 +164,6 @@
         "SystemUISharedLib",
         "SystemUI-statsd",
         "SettingsLib",
-        "com_android_systemui_communal_flags_lib",
         "com_android_systemui_flags_lib",
         "androidx.core_core-ktx",
         "androidx.viewpager2_viewpager2",

packages/SystemUI/aconfig/Android.bp

diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp
index b18c790..dc4208e 100644
--- a/packages/SystemUI/aconfig/Android.bp
+++ b/packages/SystemUI/aconfig/Android.bp
@@ -2,8 +2,7 @@
     name: "com_android_systemui_flags",
     package: "com.android.systemui",
     srcs: [
-        "systemui.aconfig",
-        "accessibility.aconfig",
+        "*.aconfig",
     ],
 }
 
@@ -11,16 +10,3 @@
     name: "com_android_systemui_flags_lib",
     aconfig_declarations: "com_android_systemui_flags",
 }
-
-aconfig_declarations {
-    name: "com_android_systemui_communal_flags",
-    package: "com.android.systemui.communal",
-    srcs: [
-        "communal.aconfig",
-    ],
-}
-
-java_aconfig_library {
-    name: "com_android_systemui_communal_flags_lib",
-    aconfig_declarations: "com_android_systemui_communal_flags",
-}

packages/SystemUI/aconfig/communal.aconfig

diff --git a/packages/SystemUI/aconfig/communal.aconfig b/packages/SystemUI/aconfig/communal.aconfig
index 8ecb984..2c6ff97 100644
--- a/packages/SystemUI/aconfig/communal.aconfig
+++ b/packages/SystemUI/aconfig/communal.aconfig
@@ -1,4 +1,4 @@
-package: "com.android.systemui.communal"
+package: "com.android.systemui"
 
 flag {
     name: "communal_hub"