refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as bein…

refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as being specific to the android framework.


Committed: http://code.google.com/p/skia/source/detail?r=8124

[borenet, 2013-03-13 12:08:19]

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h
File include/core/SkPreConfig.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h#ne...
include/core/SkPreConfig.h:52: #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) &&
!defined(SK_BUILD_FOR_ANDROID)
Where is SK_BUILD_FOR_ANDROID_FRAMEWORK defined? I don't see it in the gyp file.

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platform.h
File include/core/SkThread_platform.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platfor...
include/core/SkThread_platform.h:15: #if
!defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
I understand the desire to make as small a modification as possible, but I tend
to prefer non-inverted logic when using both cases, ie moving the
SK_BUILD_FOR_ANDROID_FRAMEWORK code up here and the 
!defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) code down.  I'll leave that up to you
though.

[djsollen, 2013-03-13 12:26:41]

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h
File include/core/SkPreConfig.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h#ne...
include/core/SkPreConfig.h:52: #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) &&
!defined(SK_BUILD_FOR_ANDROID)
On 2013/03/13 12:08:19, borenet wrote:
> Where is SK_BUILD_FOR_ANDROID_FRAMEWORK defined? I don't see it in the gyp
file.

It isn't defined because we aren't able to build the framework version since it
is not NDK compliant.

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platform.h
File include/core/SkThread_platform.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platfor...
include/core/SkThread_platform.h:15: #if
!defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
On 2013/03/13 12:08:19, borenet wrote:
> I understand the desire to make as small a modification as possible, but I
tend
> to prefer non-inverted logic when using both cases, ie moving the
> SK_BUILD_FOR_ANDROID_FRAMEWORK code up here and the 
> !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) code down.  I'll leave that up to you
> though.

I thought of doing that as well, but it makes the #ifdef block huge.  Also, this
code is already pseudo-deprecated and can be deleted when android launches their
own font manager.

[borenet, 2013-03-13 12:42:12]

LGTM

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h
File include/core/SkPreConfig.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkPreConfig.h#ne...
include/core/SkPreConfig.h:52: #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) &&
!defined(SK_BUILD_FOR_ANDROID)
On 2013/03/13 12:26:41, djsollen wrote:
> On 2013/03/13 12:08:19, borenet wrote:
> > Where is SK_BUILD_FOR_ANDROID_FRAMEWORK defined? I don't see it in the gyp
> file.
> 
> It isn't defined because we aren't able to build the framework version since
it
> is not NDK compliant.

Per our live discussion, it's defined by headers in the framework, rather than
by any conditions in our gyp files.

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platform.h
File include/core/SkThread_platform.h (right):

https://codereview.chromium.org/12739007/diff/1/include/core/SkThread_platfor...
include/core/SkThread_platform.h:15: #if
!defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
On 2013/03/13 12:26:41, djsollen wrote:
> On 2013/03/13 12:08:19, borenet wrote:
> > I understand the desire to make as small a modification as possible, but I
> tend
> > to prefer non-inverted logic when using both cases, ie moving the
> > SK_BUILD_FOR_ANDROID_FRAMEWORK code up here and the 
> > !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) code down.  I'll leave that up to
you
> > though.
> 
> I thought of doing that as well, but it makes the #ifdef block huge.  Also,
this
> code is already pseudo-deprecated and can be deleted when android launches
their
> own font manager.

SGTM

[commit-bot: I haz the power, 2013-03-13 12:48:22]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/djsollen@google.com/12739007/1

[commit-bot: I haz the power, 2013-03-13 12:48:27]

Change committed as 8124