From 8223fa0da7ea4c49d7bed2322edf38a989d125b8 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Fri, 15 Jan 2021 18:22:00 -0800
Subject: Update toolbar usage

Use car-ui-lib's base layout style of
toolbar, the old one is deprecated.

Also in this cl: removing an unneccesary
<provider> tag from the manifest, and using
sdk_version: current instead of system_current
to completely unbundle calendar.

Fixes: 177703290
Fixes: 197356281
Test: atest CarCalendarUiTests CarCalendarUnitTests
Change-Id: I5690b23933cb074acde6d4bc08f4d656f5c7db91
(cherry picked from commit a268e5e7195cc584c26047ddccf91c9688d9f914)
(cherry picked from commit b4f0b2a7fa82193bd5989897b1ded7af1b22abf8)
---
 Android.bp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index a5d91b7..ccddad5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,15 +21,16 @@ android_app {
     name: "CarCalendarApp",
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
-    sdk_version: "system_current",
-    min_sdk_version: "29",
+    sdk_version: "current",
+    target_sdk_version: "29",
+    min_sdk_version: "28",
     optimize: {
         enabled: false,
     },
     dex_preopt: {
         enabled: false,
     },
-    libs: ["android.car-system-stubs"],
+    libs: ["android.car-stubs"],
     static_libs: [
         "car-ui-lib",
         "androidx.lifecycle_lifecycle-extensions",
-- 
cgit v1.2.3