Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/gles2_conform_support/gles2_conform_support.gyp

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform.gypi ('k') | gpu/gles2_conform_support/gles2_conform_test.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gles2_conform_support/gles2_conform_support.gyp
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
index 928b152801023efb37799371d9f5740cf1408298..6bf8510e5549ab283268638055586887e294f18b 100644
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -14,8 +14,8 @@
'conditions': [
['OS=="linux"', {
'bootstrap_sources_native': [
- 'native/egl_native_aura.cc',
'native/egl_native.cc',
+ 'native/egl_native_aura.cc',
'native/egl_native_x11.cc',
],
}],
@@ -84,9 +84,9 @@
'../../third_party/khronos/khronos.gyp:khronos_headers',
],
'sources': [
- 'native/main.cc',
'native/egl_native.cc',
'native/egl_native_windowless.cc',
+ 'native/main.cc',
'<@(bootstrap_sources_native)',
],
'defines': [
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform.gypi ('k') | gpu/gles2_conform_support/gles2_conform_test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698