Fix noisy Android build
Review URL: https://codereview.appspot.com/6488107
git-svn-id: http://skia.googlecode.com/svn/trunk@5503 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 3226212..0031f02 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -62,6 +62,11 @@
}, {
'skia_arch_width%': 32,
}],
+ ['skia_os == "android"', {
+ 'skia_static_initializers%': 0,
+ }, {
+ 'skia_static_initializers%': 1,
+ }],
],
'skia_scalar%': 'float',
@@ -73,7 +78,6 @@
'android_make_apk%': 1,
'skia_nacl%': 0,
'skia_gpu%': 1,
- 'skia_static_initializers%': 1,
},
# Re-define all variables defined within the level-2 'variables' dict,