Skip to content

A
angle
Commit f78927b0 by Jamie Madill Committed by Commit Bot
Options

Remove libGLESv1_CM static.

These entry points are already duplicated into libGLESv2. Including them in the static build causes a duplicate symbol error on Android. Bug: angleproject:2344 Change-Id: I56a2f2029e7da49215e64484c1d1316add6ff1c3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2842354Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 002e5622
Showing with 0 additions and 14 deletions
BUILD.gn
...@@ -1125,16 +1125,6 @@ angle_shared_library("libGLESv1_CM") { ...@@ -1125,16 +1125,6 @@ angle_shared_library("libGLESv1_CM") {
} }
} }
angle_static_library("libGLESv1_CM_static") {
sources = libglesv1_cm_sources
configs += [ ":debug_annotations_config" ]
public_configs += [ ":angle_static" ]
deps = [
":includes",
":libGLESv2_static",
]
}
config("libEGL_egl_loader_config") { config("libEGL_egl_loader_config") {
defines = [ "ANGLE_USE_EGL_LOADER" ] defines = [ "ANGLE_USE_EGL_LOADER" ]
} }
......
src/tests/BUILD.gn
...@@ -525,7 +525,6 @@ if (build_angle_gles1_conform_tests) { ...@@ -525,7 +525,6 @@ if (build_angle_gles1_conform_tests) {
public_deps = [ public_deps = [
"$angle_root:angle_common", "$angle_root:angle_common",
"$angle_root:libEGL_static", "$angle_root:libEGL_static",
"$angle_root:libGLESv1_CM_static",
"$angle_root:libGLESv2_static", "$angle_root:libGLESv2_static",
"$angle_root:preprocessor", "$angle_root:preprocessor",
"$angle_root:translator", "$angle_root:translator",
...@@ -679,7 +678,6 @@ if (build_angle_gles1_conform_tests) { ...@@ -679,7 +678,6 @@ if (build_angle_gles1_conform_tests) {
public_deps = [ public_deps = [
"$angle_root:angle_common", "$angle_root:angle_common",
"$angle_root:libEGL_static", "$angle_root:libEGL_static",
"$angle_root:libGLESv1_CM_static",
"$angle_root:libGLESv2_static", "$angle_root:libGLESv2_static",
"$angle_root:preprocessor", "$angle_root:preprocessor",
"$angle_root:translator", "$angle_root:translator",
...@@ -757,7 +755,6 @@ if (build_angle_gles1_conform_tests) { ...@@ -757,7 +755,6 @@ if (build_angle_gles1_conform_tests) {
public_deps = [ public_deps = [
"$angle_root:angle_common", "$angle_root:angle_common",
"$angle_root:libEGL_static", "$angle_root:libEGL_static",
"$angle_root:libGLESv1_CM_static",
"$angle_root:libGLESv2_static", "$angle_root:libGLESv2_static",
"$angle_root:preprocessor", "$angle_root:preprocessor",
"$angle_root:translator", "$angle_root:translator",
...@@ -827,7 +824,6 @@ if (build_angle_gles1_conform_tests) { ...@@ -827,7 +824,6 @@ if (build_angle_gles1_conform_tests) {
public_deps = [ public_deps = [
"$angle_root:angle_common", "$angle_root:angle_common",
"$angle_root:libEGL_static", "$angle_root:libEGL_static",
"$angle_root:libGLESv1_CM_static",
"$angle_root:libGLESv2_static", "$angle_root:libGLESv2_static",
"$angle_root:preprocessor", "$angle_root:preprocessor",
"$angle_root:translator", "$angle_root:translator",
......
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