Migrate sysUI and carSysUI to the separated car user lib.
Bug: 113868873
Test: build
Change-Id: I48fb69aab7092d256c6839377c905340f9059165
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 0913503..9c33116 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -66,6 +66,7 @@
libs: [
"telephony-common",
"android.car",
+ "android.car.user",
],
aaptflags: [
@@ -119,6 +120,7 @@
"android.test.runner",
"telephony-common",
"android.car",
+ "android.car.user",
"android.test.base",
],
aaptflags: [
@@ -144,6 +146,7 @@
libs: [
"telephony-common",
"android.car",
+ "android.car.user",
],
dxflags: ["--multi-dex"],
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index 6057614..aac37a2 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -38,7 +38,8 @@
android.test.runner \
telephony-common \
android.test.base \
- android.car
+ android.car \
+ android.car.user
LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui:com.android.keyguard