Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ia99aa2f8c532b6463970d76740b6c206080f077d
Change-Id: Ia6f6b11708a9996fa6c96a969e2effa7c18da328
diff --git a/Android.bp b/Android.bp
index ef59487..dbc5303 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,4 +9,12 @@
privileged: true,
certificate: "platform", // Media must be signed by the platform
required: ["allowed_privapp_com.android.car.media"],
+ // 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/CarMediaApp.apk b/CarMediaApp.apk
index c69f27b..a6963cf 100644
--- a/CarMediaApp.apk
+++ b/CarMediaApp.apk
Binary files differ
