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

Unified Diff: gyp/common_conditions.gypi

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/common.gypi ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 5f99eae34077f2fc3b90c751eaa3f997b8aa1fcb..6be5c86a7a6c432b4dd8ce18fa00257cdb29103e 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -208,7 +208,7 @@
],
# The following section is common to linux + derivatives and android
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]',
{
'cflags': [
'-g',
@@ -329,13 +329,6 @@
},
],
- [ 'skia_os == "nacl"', {
- # NaCl compiler is GCC 4.4, which is too old to understand 'c++11', so call it '0x'.
- # NaCl's newlib needs gnu++ mode to see snprintf, vsnprintf, etc in C++11 mode.
- 'cflags_cc!': [ '-std=c++11' ],
- 'cflags_cc' : [ '-std=gnu++0x' ],
- }],
-
['skia_android_framework', {
'includes' : [
'skia_for_android_framework_defines.gypi',
@@ -407,7 +400,7 @@
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
{
'defines': [
'SK_SAMPLES_FOR_X',
@@ -434,26 +427,6 @@
'SKIA_IMPLEMENTATION=1',
],
}],
- [ 'skia_os == "nacl"', {
- 'defines': [
- 'SK_BUILD_FOR_NACL',
- ],
- 'variables': {
- 'nacl_sdk_root': '<!(echo ${NACL_SDK_ROOT})',
- },
- 'link_settings': {
- 'libraries': [
- '-lppapi',
- '-lppapi_cpp',
- '-lnosys',
- '-pthread',
- ],
- 'ldflags': [
- '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release',
- '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Release',
- ],
- },
- }],
# Enable asan, tsan, etc.
[ 'skia_sanitizer', {
'cflags': [
« no previous file with comments | « gyp/common.gypi ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698