diff options
| author | 2023-10-13 15:52:45 +0000 | |
|---|---|---|
| committer | 2023-10-13 15:52:45 +0000 | |
| commit | c8f659f2660c5d3ddd9c667be7dfe5ed6709bc12 (patch) | |
| tree | 510ab590e10f022d97d6b05d0df042ddfab4b988 | |
| parent | 74148384c2f0af99fc0d7d563054185e69c6b373 (diff) | |
| parent | c1dc96ad0046fa247087ec04cf66219073fb7681 (diff) | |
Merge "Update communal aconfig package to systemui" into main
| -rw-r--r-- | packages/SystemUI/Android.bp | 1 | ||||
| -rw-r--r-- | packages/SystemUI/aconfig/Android.bp | 16 | ||||
| -rw-r--r-- | packages/SystemUI/aconfig/communal.aconfig | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 4f55e8b3bd4e..4954cb482120 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -165,7 +165,6 @@ android_library { "SystemUISharedLib", "SystemUI-statsd", "SettingsLib", - "com_android_systemui_communal_flags_lib", "com_android_systemui_flags_lib", "androidx.core_core-ktx", "androidx.viewpager2_viewpager2", diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp index b18c7900a168..dc4208e87207 100644 --- a/packages/SystemUI/aconfig/Android.bp +++ b/packages/SystemUI/aconfig/Android.bp @@ -2,8 +2,7 @@ aconfig_declarations { name: "com_android_systemui_flags", package: "com.android.systemui", srcs: [ - "systemui.aconfig", - "accessibility.aconfig", + "*.aconfig", ], } @@ -11,16 +10,3 @@ java_aconfig_library { 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", -} diff --git a/packages/SystemUI/aconfig/communal.aconfig b/packages/SystemUI/aconfig/communal.aconfig index 8ecb9842ddc5..2c6ff979cc7f 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" |