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

Unified Diff: gyp/ports.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/nacl.gyp ('k') | gyp/tools.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 0f442cde1b108db3bbb7bdd7751a192519629410..48fe89f37a1d78c21bbc5bbdfe1ad19548bcca45 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -26,7 +26,6 @@
'../src/utils',
],
'sources': [
- '../src/ports/SkDebug_nacl.cpp',
'../src/ports/SkDebug_stdio.cpp',
'../src/ports/SkDebug_win.cpp',
@@ -59,7 +58,7 @@
'../include/ports/SkRemotableFontMgr.h',
],
'conditions': [
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
'sources': [
'../src/ports/SkFontHost_FreeType.cpp',
'../src/ports/SkFontHost_FreeType_common.cpp',
@@ -130,18 +129,6 @@
}]
],
}],
- [ 'skia_os == "nacl"', {
- 'sources': [
- '../src/ports/SkFontHost_linux.cpp',
- ],
- 'sources!': [
- '../src/ports/SkDebug_stdio.cpp',
- ],
- }, {
- 'sources!': [
- '../src/ports/SkDebug_nacl.cpp',
- ],
- }],
[ 'skia_os == "mac"', {
'include_dirs': [
'../include/utils/mac',
« no previous file with comments | « gyp/nacl.gyp ('k') | gyp/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698