Skip to content

A
angle
Commit 8b8dc561 by Yuly Novikov Committed by Commit Bot
Options

Fix Android component build.

Shared libraries have .cr.so extension in Android component builds. Tests were failing to load the ANGLE libraries with just .so extensions. Bug: angleproject:4396 Change-Id: I88555c830c49136623ea9da9896f86ea6204f3b1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2076778Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent e488d8b8
Showing with 11 additions and 4 deletions
BUILD.gn
...@@ -772,10 +772,17 @@ config("shared_library_public_config") { ...@@ -772,10 +772,17 @@ config("shared_library_public_config") {
} }
config("library_name_config") { config("library_name_config") {
defines = [ if (is_component_build && is_android) {
"ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}\"", defines = [
"ANGLE_GLESV2_LIBRARY_NAME=\"libGLESv2${angle_libs_suffix}\"", "ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}.cr\"",
] "ANGLE_GLESV2_LIBRARY_NAME=\"libGLESv2${angle_libs_suffix}.cr\"",
]
} else {
defines = [
"ANGLE_EGL_LIBRARY_NAME=\"libEGL${angle_libs_suffix}\"",
"ANGLE_GLESV2_LIBRARY_NAME=\"libGLESv2${angle_libs_suffix}\"",
]
}
} }
# This config controls export definitions on ANGLE API calls. # This config controls export definitions on ANGLE API calls.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment