Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 5d600b0dba1802959c7f03dec810e7d8fcb0cddb..ff7ad6b2ddc276b8b2890722a2564d76ed420d11 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -107,6 +107,9 @@ |
# Android build system, value 1). |
'android_build_type%': 0, |
+ # Sets whether Android uses ARM FFT. Default is no. |
+ 'use_arm_fft%': 0, |
+ |
# Sets whether chrome is built for google tv device. |
'google_tv%': 0, |
@@ -177,6 +180,8 @@ |
'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194 |
'buildtype%': '<(buildtype)', |
+ 'use_arm_fft%': '<(use_arm_fft)', |
+ |
# We used to provide a variable for changing how libraries were built. |
# This variable remains until we can clean up all the users. |
# This needs to be one nested variables dict in so that dependent |
@@ -605,7 +610,6 @@ |
}, { |
'enable_settings_app%': 0, |
}], |
- |
['OS=="linux" and target_arch=="arm" and chromeos==0', { |
# Set some defaults for arm/linux chrome builds |
'armv7%': 1, |
@@ -755,6 +759,9 @@ |
# Use system nspr instead of the bundled one. |
'use_system_nspr%': 0, |
+ # Use ARM FFT if requested |
+ 'use_arm_fft%': '<(use_arm_fft)', |
+ |
# Use system protobuf instead of bundled one. |
'use_system_protobuf%': 0, |
@@ -1157,6 +1164,7 @@ |
# Always uses openssl. |
'use_openssl%': 1, |
+ 'use_arm_fft%': '<(use_arm_fft)', |
Paweł Hajdan Jr.
2013/02/27 17:56:58
Why so many deep repetitions?
Isn't it sufficient
|
'proprietary_codecs%': '<(proprietary_codecs)', |
'enable_task_manager%': 0, |
'safe_browsing%': 2, |