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

Unified Diff: gyp/gpu.gyp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 9 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 | « gyp/freetype.gyp ('k') | gyp/gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 8e4cb070b295da5e2db9ad5056f6c236c175bb32..7d3dad54636166ea3de9062504ef1b4a9d1a9c74 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -26,11 +26,7 @@
'sources/': [ ['exclude', '_android.(h|cpp)$'],
],
}],
- ['skia_os != "nacl"', {
- 'sources/': [ ['exclude', '_nacl.(h|cpp)$'],
- ],
- }],
- ['skia_os == "nacl" or skia_egl == 0', {
+ ['skia_egl == 0', {
'sources/': [ ['exclude', '_egl.(h|cpp)$'],
],
}],
@@ -170,13 +166,6 @@
],
},
}],
- [ 'skia_os == "nacl"', {
- 'link_settings': {
- 'libraries': [
- '-lppapi_gles2',
- ],
- },
- }],
[ 'skia_egl == 1', {
'defines': [
'SK_EGL=1',
« no previous file with comments | « gyp/freetype.gyp ('k') | gyp/gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698