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

Unified Diff: gyp/common_variables.gypi

Issue 143423004: ARM Skia NEON patches - 35 - First AArch64 support (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Move definition of skia_arch_width Created 6 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/opts.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 6145d47e0137e45ff3bdc247e807b7231c2f2549..45b9963070fe54676f095d9f1ff324e8824e6985 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -72,11 +72,6 @@
}, {
'skia_poppler_enabled%': 0,
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
- 'skia_arch_width%': 64,
- }, {
- 'skia_arch_width%': 32,
- }],
[ 'skia_os == "android"', {
'skia_static_initializers%': 0,
}, {
@@ -91,6 +86,11 @@
'arm_version%': 0,
'arm_neon%': 0,
}],
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"] or skia_arch_type == "arm64"', {
djsollen 2014/04/01 18:52:17 you can move this back to its original spot.
kevin.petit 2014/04/02 13:16:48 Done.
+ 'skia_arch_width%': 64,
+ }, {
+ 'skia_arch_width%': 32,
+ }],
[ 'skia_os in ["android", "nacl"] and not skia_android_framework',
# skia_freetype_static - on OS variants that normally would
# dynamically link the system FreeType library, don't do
« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/opts.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698