diff options
| author | 2018-11-07 17:23:29 +0000 | |
|---|---|---|
| committer | 2018-11-07 17:23:29 +0000 | |
| commit | 70afdedb3ea526045fb27ba4d7de6cb242f9b9bf (patch) | |
| tree | f0039082b8cc378ed650519d88858316cfbc79ba | |
| parent | cc210219061f47c8ec725cf7b9664351f2adc68d (diff) | |
| parent | 149f93841b37f1c0c5f7e7a0193a53c29a03102b (diff) | |
Merge "Clean up car user lib in system UI."
| -rw-r--r-- | packages/CarSystemUI/Android.bp | 2 | ||||
| -rw-r--r-- | packages/SystemUI/Android.bp | 8 | ||||
| -rw-r--r-- | packages/SystemUI/tests/Android.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/CarSystemUI/Android.bp b/packages/CarSystemUI/Android.bp index 1b1bf8d4b34a..8f13497b2673 100644 --- a/packages/CarSystemUI/Android.bp +++ b/packages/CarSystemUI/Android.bp @@ -30,7 +30,7 @@ android_app { "SystemUIPluginLib", "SystemUISharedLib", "SettingsLib", - "android.car.user", + "android.car.userlib", "androidx.car_car", "androidx.legacy_legacy-support-v4", "androidx.recyclerview_recyclerview", diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index b770d5c88324..a00baaddb4b1 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -66,7 +66,7 @@ android_library { libs: [ "telephony-common", "android.car", - "android.car.user", + "android.car.userlib", ], aaptflags: [ @@ -120,7 +120,7 @@ android_library { "android.test.runner", "telephony-common", "android.car", - "android.car.user", + "android.car.userlib", "android.test.base", ], aaptflags: [ @@ -146,7 +146,7 @@ android_app { libs: [ "telephony-common", "android.car", - "android.car.user", + "android.car.userlib", ], dxflags: ["--multi-dex"], @@ -183,7 +183,7 @@ android_app { libs: [ "telephony-common", "android.car", - "android.car.user", + "android.car.userlib", ], srcs: [ diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index aac37a290edc..b32bf99ad53d 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -39,7 +39,7 @@ LOCAL_JAVA_LIBRARIES := \ telephony-common \ android.test.base \ android.car \ - android.car.user + android.car.userlib LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui:com.android.keyguard |