From c2dd3d4109a544dae3f6eeee7a1f05178619c1b7 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 11 Sep 2012 21:37:28 +0000 Subject: [PATCH] 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_conditions.gypi | 1 - gyp/common_variables.gypi | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index b9fa429..1256ef6 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -229,7 +229,6 @@ 'defines': [ 'SK_BUILD_FOR_ANDROID', 'SK_BUILD_FOR_ANDROID_NDK', - 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', ], 'configurations': { 'Debug': { 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, -- 2.7.4