Fix Android build

Fix Android build
Committed: https://code.google.com/p/skia/source/detail?r=3113

[DerekS, 2012-01-09 14:46:37]

The android port doesn't support animator. It seems like somehow gyp was
confused when it was run. Try deleting the out directory in trunk and rebuild
with the android_make command.

[digit, 2012-01-09 14:58:09]

On 2012/01/09 14:46:37, djsollen wrote:
> The android port doesn't support animator. It seems like somehow gyp was
> confused when it was run. Try deleting the out directory in trunk and rebuild
> with the android_make command.

That didn't fix anything. I'm doing a fresh checkout following the instructions
at http://code.google.com/p/skia/wiki/GettingStartedOnAndroid

i.e.:

  curl http://skia.googlecode.com/svn/android/gclient.config -o .gclient
  gclient sync
  cd trunk
  ../android/bin/android_make -d xoom -j

And it fails to build src/animator/SkDisplayEvent.cpp (see below).

I think there must be a problem with the gyp configuration then, buI'm not sure
what to do right now about it, and this patch gets me going.

../src/animator/SkDisplayEvent.cpp:265: error: prototype for 'void
SkMetaData::setPtr(const char*, void*)' does not match any in class 'SkMetaData'
../include/core/SkMetaData.h:91: error: candidate is: void
SkMetaData::setPtr(const char*, void*, void* (*)(void*, bool))
../src/animator/SkDisplayEvent.cpp:270: error: prototype for 'void
SkEvent::setType(const char*, long unsigned int)' does not match any in class
'SkEvent'
../include/views/SkEvent.h:61: error: candidates are: void
SkEvent::setType(const char*, size_t)
../include/views/SkEvent.h:56: error:                 void
SkEvent::setType(const SkString&)
../src/animator/SkDisplayEvent.cpp:271: error: no 'bool
SkEvent::PostTime(SkEvent*, unsigned int, unsigned int)' member function
declared in class 'SkEvent'
../src/animator/SkDisplayEvent.cpp:272: error: prototype for
'SkEvent::SkEvent(const char*)' does not match any in class 'SkEvent'
../include/views/SkEvent.h:41: error: candidates are: SkEvent::SkEvent(const
SkEvent&)
../include/views/SkEvent.h:40: error:                 SkEvent::SkEvent(const
char*, SkEventSinkID)
../include/views/SkEvent.h:39: error:                 SkEvent::SkEvent(const
SkString&, SkEventSinkID)
../include/views/SkEvent.h:38: error:                 SkEvent::SkEvent()
../src/animator/SkDisplayEvent.cpp:279: error: prototype for 'bool
SkXMLParser::parse(const char*, long unsigned int)' does not match any in class
'SkXMLParser'
../include/xml/SkXMLParser.h:63: error: candidates are: bool
SkXMLParser::parse(const SkDOM&, const SkDOMNode*)
../src/animator/SkDisplayEvent.cpp:268: error:                 bool
SkXMLParser::parse(SkStream&)
../include/xml/SkXMLParser.h:61: error:                 bool
SkXMLParser::parse(const char*, size_t)
../src/animator/SkDisplayEvent.cpp:281: error: no 'bool SkEvent::Post(SkEvent*,
unsigned int, unsigned int)' member function declared in class 'SkEvent'
....

[reed1, 2012-01-09 15:09:06]

1. these changes seem correct
2. animator can be removed from any android builds as it is currently deprecated
for now

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

I'm fine with taking the change as it is an improvement over the current state,
but I'm concerned that it is even being built.  I followed the steps you took on
my linux machine and didn't run into the error. 

The only dependency to the animator.gyp file are in SampleApp.gyp and that file
explicitly removes the dependency for android builds (line 257).

[digit, 2012-01-09 17:51:17]

On 2012/01/09 15:18:37, djsollen wrote:
> I'm fine with taking the change as it is an improvement over the current
state,
> but I'm concerned that it is even being built.  I followed the steps you took
on
> my linux machine and didn't run into the error. 
> 
> The only dependency to the animator.gyp file are in SampleApp.gyp and that
file
> explicitly removes the dependency for android builds (line 257).

ok, so just to be sure. it's ok to submit this?
I'm concerned that you can't reproduce this though.

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

lgtm.

It's fine to submit. Do you know which make file is referencing that class? I'm
trying to figure out how gyp is including that in your build as we aren't
attempting to support animator on Android.

[digit, 2012-01-09 18:19:39]

On 2012/01/09 18:09:01, djsollen wrote:
> lgtm.
> 
> It's fine to submit. Do you know which make file is referencing that class?
I'm
> trying to figure out how gyp is including that in your build as we aren't
> attempting to support animator on Android.

Looks like it's line 154 of gyp/SampleApp.gyp

There is something about Android not supporting in gyp/views.gyp where the
include files for the animator files and a few sources are removed, but it seems
the component/target is still being built due to SampleApp.gyp

[DerekS, 2012-01-09 18:29:42]

On 2012/01/09 18:25:15, digit wrote:

The line 154 is correct, but it should be overridden by line 257 which excludes
that dependency for android builds. The puzzling part is that override doesn't
seem to be working for you.

[digit, 2012-01-31 14:12:09]

I'm going to submit it. I don't know what's happening, really, but having to
cherry-pick this change on top of my other changes each time I want to check
that they build everything properly, then revert them before uploading is time
consuming and error-prone.

Thanks.