diff options
| author | 2018-09-11 23:49:02 +0000 | |
|---|---|---|
| committer | 2018-09-11 23:49:02 +0000 | |
| commit | 1449effd2c94bcd450deb8947d5864c2d740091a (patch) | |
| tree | a0157bf5180924d2c6b146bf33b40c2541f677e0 | |
| parent | 4dc4c3ae6f5ca6d96c724f1049be06c8ebcac37e (diff) | |
| parent | 4fd6b783e3fa28f648460fd06a6b5a6b4fa13f64 (diff) | |
Merge "Migrate sysUI and carSysUI to the separated car user lib."
| -rw-r--r-- | packages/CarSystemUI/Android.bp | 1 | ||||
| -rw-r--r-- | packages/SystemUI/Android.bp | 3 | ||||
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/packages/CarSystemUI/Android.bp b/packages/CarSystemUI/Android.bp index f908595c7da1..86f90327ce4f 100644 --- a/packages/CarSystemUI/Android.bp +++ b/packages/CarSystemUI/Android.bp @@ -51,6 +51,7 @@ android_app { libs: [ "telephony-common", "android.car", + "android.car.user", ], manifest: "AndroidManifest.xml", diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 091350334835..9c33116a149b 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -66,6 +66,7 @@ android_library { libs: [ "telephony-common", "android.car", + "android.car.user", ], aaptflags: [ @@ -119,6 +120,7 @@ android_library { "android.test.runner", "telephony-common", "android.car", + "android.car.user", "android.test.base", ], aaptflags: [ @@ -144,6 +146,7 @@ android_app { 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 6057614f26ee..aac37a290edc 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -38,7 +38,8 @@ LOCAL_JAVA_LIBRARIES := \ 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 |