Merge cherrypicks of ['ag/20890015'] into tm-qpr2-release.
Change-Id: I3ef16809d395b88f183914f6ff805ebb960d45f2
diff --git a/Android.bp b/Android.bp
index f97ada3..6efe391 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,4 +10,12 @@
certificate: "platform",
required: ["allowed_privapp_com.android.car.messenger"],
overrides: ["messaging"],
+ // This flag is needed because we're inehriting 2 `uses-library` tags from `androidx.window`
+ // that it's coming from Compose support in `car-ui-lib` in the manifest. And Soong is
+ // enforcing that both the shared libraries must be in the image. But since both of them are
+ // set to optional we can use the following flag to ignore the build error.
+ optional_uses_libs: [
+ "androidx.window.extensions",
+ "androidx.window.sidecar"
+ ]
}
diff --git a/CarMessengerApp.apk b/CarMessengerApp.apk
index 6f6373f..a40b6ab 100644
--- a/CarMessengerApp.apk
+++ b/CarMessengerApp.apk
Binary files differ
