Merge "goldfish-opengl: use Mesa provided libraries" into main am: 0e154a94f4 am: b65b24dd32
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/3256979
Change-Id: I0cd5f284699990282f91f0861f32d0d7f52e9612
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/system/codecs/c2/decoders/base/Android.bp b/system/codecs/c2/decoders/base/Android.bp
index 9b46235..af93b41 100644
--- a/system/codecs/c2/decoders/base/Android.bp
+++ b/system/codecs/c2/decoders/base/Android.bp
@@ -41,9 +41,9 @@
],
static_libs: [
- "libplatform_virtgpu",
- "libGoldfishAddressSpace",
- "libmesa_util_gfxstream",
+ "mesa_platform_virtgpu",
+ "mesa_goldfish_address_space",
+ "mesa_util",
],
header_libs: [
diff --git a/system/codecs/omx/common/Android.bp b/system/codecs/omx/common/Android.bp
index 7a7f727..5e5af97 100644
--- a/system/codecs/omx/common/Android.bp
+++ b/system/codecs/omx/common/Android.bp
@@ -26,10 +26,10 @@
"liblog",
],
static_libs: [
- "libGoldfishAddressSpace",
+ "mesa_goldfish_address_space",
],
whole_static_libs: [
- "libGoldfishAddressSpace",
+ "mesa_goldfish_address_space",
],
export_include_dirs: [
"include",
diff --git a/system/gralloc/Android.bp b/system/gralloc/Android.bp
index fa212cd..05a57a4 100644
--- a/system/gralloc/Android.bp
+++ b/system/gralloc/Android.bp
@@ -33,7 +33,7 @@
"libOpenglSystemCommon",
],
static_libs: [
- "libGoldfishAddressSpace",
+ "mesa_goldfish_address_space",
"libqemupipe.ranchu",
],
cflags: [
@@ -63,7 +63,7 @@
"libOpenglSystemCommon",
],
static_libs: [
- "libGoldfishAddressSpace",
+ "mesa_goldfish_address_space",
"libqemupipe.ranchu",
],
cflags: [
diff --git a/system/hwc3/Android.bp b/system/hwc3/Android.bp
index 486c0fd..9e0a1ab 100644
--- a/system/hwc3/Android.bp
+++ b/system/hwc3/Android.bp
@@ -56,7 +56,7 @@
header_libs: [
"libminigbm_gralloc_headers",
- "libgfxstream_guest_android_headers",
+ "mesa_gfxstream_guest_android_headers",
],
srcs: [
