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

Unified Diff: gyp/common_variables.gypi

Issue 304903003: MIPS: modified gypi files to support build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: added MIPS to AUTHORS file Created 6 years, 7 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
« gyp/common_conditions.gypi ('K') | « gyp/common_conditions.gypi ('k') | no next file » | 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 61efe92eecaf1103f20eccbff1336903267c462c..18043caf6fb640097815c7ef792220695b3d111d 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -93,7 +93,15 @@
'arm_version%': 7,
'arm_neon%': 0, # neon asm files known not to work with the ios build
},{ # skia_os is not ios
- 'skia_arch_type%': 'x86',
+ 'conditions': [
+ [ 'skia_target_arch == "mips"', {
+ 'skia_arch_type%': 'mips',
djsollen 2014/05/29 17:01:08 I've just submitted a CL to clean this up a little
+ 'mips_dsp%': 1,
+ 'mips_dspr2%': 1,
djsollen 2014/05/29 17:01:08 do you expect all mips builds to support _dsp and
+ }, {
+ 'skia_arch_type%': 'x86',
+ }],
+ ],
'arm_version%': 0,
'arm_neon%': 0,
}],
@@ -189,6 +197,10 @@
'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)',
'arm_neon_optional%': 0,
+ 'mips_dsp%': '<(mips_dsp)',
+ 'mips_dspr2%': '<(mips_dspr2)',
+ 'mips_dsp_optional%': 0,
+ 'mips_dspr2_optional%': 0,
'skia_os%': '<(skia_os)',
'os_posix%': '<(os_posix)',
« gyp/common_conditions.gypi ('K') | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698