Commit 20af2b63 authored by djkurtz@chromium.org's avatar djkurtz@chromium.org

Do not directly link to EGL/GLESv2 for arm x11 chromeos

Chrome will already link to EGL/GLES if/when it needs to.
We need not explicitly set these libraries via link settings.

This works around the fact that the chromeos arm-generic board does not
currently use EGL/GLES.  It uses GLX and OpenGL as provided by mesa's
xlib-glx.  In order to satisfy these hard coded -lEGL -lGLES linker
settings, arm-generic was forced to build a dummy EGL/GLES implementation.
Without these link settings, we can remove the dummy opengles.

BUG=chromium:330163
TEST=build chrome on arm-generic and peach_pi using
     simple chrome
TEST=emerge chromeos-chrome on arm-generic and peach_pi
     in cros chroot
TEST=For peach_pi: build video_encode_accelerator_unittest,
     scp to device and run
TEST=For peach_pi: build video_decode_accelerator_unittest,
     scp to device and run

Review URL: https://codereview.chromium.org/335393005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278598 0039d316-1c4b-4281-b951-d872f2087c98
parent afff175b
...@@ -669,12 +669,6 @@ ...@@ -669,12 +669,6 @@
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/khronos', '<(DEPTH)/third_party/khronos',
], ],
'link_settings': {
'libraries': [
'-lEGL',
'-lGLESv2',
],
},
}], }],
['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
'sources': [ 'sources': [
......
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