Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp index 67504e7..9ee7bb2 100644 --- a/common/androidx-media3/Android.bp +++ b/common/androidx-media3/Android.bp
@@ -16,6 +16,7 @@ "//packages/providers/MediaProvider:__subpackages__", "//test/wvts:__subpackages__", "//prebuilts/sdk/current/aaos-libs", + "//frameworks/base/packages/SystemUI:__pkg__" ] android_library_import {
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT index bdcf59f..bf33438 100644 --- a/common/layoutlib_api/PREBUILT +++ b/common/layoutlib_api/PREBUILT
@@ -1 +1 @@ -layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@2db2ec0171aba79b56fe11de5f7ac0f0fe4fb806 +layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@ebe53ac2e6fe1071415f87ca9cad0cd0874f08a8
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar index d02e2fa..01c34f7 100644 --- a/common/layoutlib_api/layoutlib_api-prebuilt.jar +++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar index 5444a7e..45e0a7d 100644 --- a/common/layoutlib_api/layoutlib_api-sources.jar +++ b/common/layoutlib_api/layoutlib_api-sources.jar Binary files differ
diff --git a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/V/librobolectric-nativeruntime.so b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/V/librobolectric-nativeruntime.so old mode 100755 new mode 100644 index 12e05d5..4f5b3db --- a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/V/librobolectric-nativeruntime.so +++ b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/V/librobolectric-nativeruntime.so Binary files differ