commit c2dd3d4109a544dae3f6eeee7a1f05178619c1b7
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 11 21:37:28 2012 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Sep 11 21:37:28 2012 +0000
tree 855dd9e51ad5b19bbae6f7d3cb514b368922ec36
parent 0d25eefd7a25afe859cb2d4cf733a3cf07f12139

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

gyp/common_variables.gypi

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,