Android: disable static global initializers for SkFlattenable and SkPixelRef

Android: disable static global initializers
    
Committed: http://code.google.com/p/skia/source/detail?r=2992

[DerekS, 2012-01-09 15:27:08]

I think this patch can be reduced to a one-liner in common_conditions.gypi.  In
the current skia_os=android condition we just need to add the following to the
existing defines clause...

'defines': [
    'SK_BUILD_FOR_ANDROID',
    'SK_BUILD_FOR_ANDROID_NDK',
    'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0'
],

http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h
File include/core/SkFlattenable.h (right):

http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h#new...
include/core/SkFlattenable.h:101: friend class SkGraphics;
why is this needed?

http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h
File include/core/SkPostConfig.h (right):

http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h#newc...
include/core/SkPostConfig.h:296: #ifndef SK_NO_STATIC_GLOBAL_INITIALIZERS
I think we should leave this as is and have the gyp define
'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0'

http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp
File src/core/SkGraphics.cpp (right):

http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp#newcode30
src/core/SkGraphics.cpp:30: #include "SkPixelRef.h"
where is this used?

[digit, 2012-01-09 16:41:03]

On 2012/01/09 15:27:08, djsollen wrote:
> I think this patch can be reduced to a one-liner in common_conditions.gypi. 
In
> the current skia_os=android condition we just need to add the following to the
> existing defines clause...
> 
> 'defines': [
>     'SK_BUILD_FOR_ANDROID',
>     'SK_BUILD_FOR_ANDROID_NDK',
>     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0'
> ],
> 
look like an excellent idea, I'll try that, thanks.

> http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h
> File include/core/SkFlattenable.h (right):
> 
>
http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h#new...
> include/core/SkFlattenable.h:101: friend class SkGraphics;
> why is this needed?
> 
> http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h
> File include/core/SkPostConfig.h (right):
> 
>
http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h#newc...
> include/core/SkPostConfig.h:296: #ifndef SK_NO_STATIC_GLOBAL_INITIALIZERS
> I think we should leave this as is and have the gyp define
> 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0'
> 
> http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp
> File src/core/SkGraphics.cpp (right):
> 
> http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp#newcode30
> src/core/SkGraphics.cpp:30: #include "SkPixelRef.h"
> where is this used?

[digit, 2012-01-09 17:55:40]

http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h
File include/core/SkFlattenable.h (right):

http://codereview.appspot.com/5503066/diff/1/include/core/SkFlattenable.h#new...
include/core/SkFlattenable.h:101: friend class SkGraphics;
On 2012/01/09 15:27:09, djsollen wrote:
> why is this needed?

otherwise this doesn't compile.  InitializeFlattenables() is called from
SkGraphics::Init() in src/core/SkGraphics.cpp

http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h
File include/core/SkPostConfig.h (right):

http://codereview.appspot.com/5503066/diff/1/include/core/SkPostConfig.h#newc...
include/core/SkPostConfig.h:296: #ifndef SK_NO_STATIC_GLOBAL_INITIALIZERS
On 2012/01/09 15:27:09, djsollen wrote:
> I think we should leave this as is and have the gyp define
> 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0'

ok, will do

http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp
File src/core/SkGraphics.cpp (right):

http://codereview.appspot.com/5503066/diff/1/src/core/SkGraphics.cpp#newcode30
src/core/SkGraphics.cpp:30: #include "SkPixelRef.h"
On 2012/01/09 15:27:09, djsollen wrote:
> where is this used?

SkGraphics::Init()

[DerekS, 2012-01-09 18:15:44]

move the gyp change to common_conditions.gypi and just use
SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 and it is good to go.

[digit, 2012-01-10 10:27:39]

On 2012/01/09 18:15:44, djsollen wrote:
> move the gyp change to common_conditions.gypi and just use
> SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 and it is good to go.

Turns out that after sync to upstream this morning, a single line change in
common_conditions.gypi is now needed. Sweet :-)

[DerekS, 2012-01-11 16:30:29]

lgtm