diff options
| author | Anthony Chen <ajchen@google.com> | 2018-05-04 17:24:49 -0700 |
|---|---|---|
| committer | Anthony Chen <ajchen@google.com> | 2018-05-04 17:24:49 -0700 |
| commit | 5ff078c5e21ab7f59456663950772edc68ac4d08 (patch) | |
| tree | 441c8f35b20cec2eb58d57c5d26b634441389187 | |
| parent | 4c1943ee95b8c5ac379383f3a1c8d5c44c74cf2f (diff) | |
| download | sdk-5ff078c5e21ab7f59456663950772edc68ac4d08.tar.gz | |
Fix error where android-support-car is depending on an androidx target.
Bug: 79270323
Test: build dependent applications and verify no runtime error for
AppCompatViewInflater
Change-Id: I85c5774a6aaee8866e1a0bb9ea5572a79b52fc74
| -rw-r--r-- | current/support/Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/current/support/Android.bp b/current/support/Android.bp index eb8cce803..fc58932de 100644 --- a/current/support/Android.bp +++ b/current/support/Android.bp @@ -81,9 +81,9 @@ android_library_import { aars: ["m2repository/com/android/support/car/28.0.0/car-28.0.0.aar"], sdk_version: "current", static_libs: [ + "android-support-design", "android-support-v7-appcompat", "android-support-v7-cardview", - "androidx.design_design-widget", "android-support-v4", "android-support-v7-recyclerview", "android-support-v7-gridlayout", @@ -96,11 +96,11 @@ android_library { sdk_version: "current", manifest: "manifests/android-support-car/AndroidManifest.xml", static_libs: [ + "android-support-design", "android-support-car-nodeps", "android-support-annotations", "android-support-v7-appcompat", "android-support-v7-cardview", - "androidx.design_design-widget", "android-support-v4", "android-support-v7-recyclerview", "android-support-v7-gridlayout", |