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

Unified Diff: gyp/common_variables.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_conditions.gypi ('k') | gyp/debugger.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 80ab7c91ed7c996761a5e61d43f179c7eb73cceb..b9f0bd7a9aa884501240e1362a20a4add1acf6f4 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -102,10 +102,7 @@
'arm_version%': 7,
'arm_neon%': 0, # neon asm files known not to work with the ios build
}],
- [ 'skia_os == "nacl"', {
- 'skia_egl%': 1,
- }],
- [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
+ [ 'skia_os == "android" and not skia_android_framework',
# skia_freetype_static - on OS variants that normally would
# dynamically link the system FreeType library, don't do
# that; instead statically link to the version in
« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/debugger.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698