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

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: Some more gyp file tuning 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..2add2ee735d529b553a9e3a4600c007137e527b0 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -47,12 +47,14 @@
'skia_os%': '<(OS)',
'skia_android_framework%': 0,
+ 'skia_arch_type%': 'x86',
},
# Re-define all variables defined within the level-3 'variables' dict,
# so that siblings of the level-2 'variables' dict can see them.
# (skia_os will depend on skia_android_framework.)
'skia_android_framework%': '<(skia_android_framework)',
+ 'skia_arch_type%': '<(skia_arch_type)',
'conditions': [
[ 'skia_android_framework == 1', {
@@ -72,7 +74,7 @@
}, {
'skia_poppler_enabled%': 0,
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"] or skia_arch_type == "arm64"', {
'skia_arch_width%': 64,
}, {
'skia_arch_width%': 32,
« 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