From c444a567a5f94afb802cc98de84590ebec1380e9 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Tue, 2 Jul 2024 21:17:32 +0000 Subject: Fix flags linking for SystemUI Targets that build against the platform (with no set SDK version) can and should reuse flags that are already linked into the framework. Fix this for SystemUI. Bug: 326561340 Test: m + check duplicate library/program warnings from R8 Flag: EXEMPT bugfix Change-Id: I15c02e8c4ffc762df1ce3249de77cdb15f94ae30 --- libs/WindowManager/Shell/Android.bp | 1 - packages/SystemUI/Android.bp | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 1e6824196687..d751b791e3e5 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -215,7 +215,6 @@ android_library { "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib", "//frameworks/libs/systemui:iconloader_base", "com_android_wm_shell_flags_lib", - "com.android.window.flags.window-aconfig-java", "WindowManager-Shell-proto", "WindowManager-Shell-shared", "perfetto_trace_java_protos", diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index bd7c9a0e1e55..9efccda6e684 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -577,7 +577,6 @@ android_library { "androidx.activity_activity-compose", "androidx.compose.animation_animation-graphics", "androidx.lifecycle_lifecycle-viewmodel-compose", - "device_policy_aconfig_flags_lib", ], libs: [ "keepanno-annotations", -- cgit v1.2.3-59-g8ed1b