prepare skia for shared library build on android

prepare skia for shared library build on android

R=borenet@google.com, djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9378

Committed: https://code.google.com/p/skia/source/detail?r=9379

[djsollen, 2013-05-30 20:35:28]

you need to include your new file. Also run a standard linux build and make sure
that these gyp changes didn't break anything.

https://codereview.chromium.org/15855006/diff/6001/gyp/common_conditions.gypi
File gyp/common_conditions.gypi (right):

https://codereview.chromium.org/15855006/diff/6001/gyp/common_conditions.gypi...
gyp/common_conditions.gypi:143: }],
remove this to make it clear that we don't support shared_libs in anything but
android

https://codereview.chromium.org/15855006/diff/6001/gyp/common_conditions.gypi...
gyp/common_conditions.gypi:218: ],
remove this to make it clear that we don't support shared_libs in anything but
android

https://codereview.chromium.org/15855006/diff/6001/gyp/common_conditions.gypi...
gyp/common_conditions.gypi:298: }],
remove this to make it clear that we don't support shared_libs in anything but
android

https://codereview.chromium.org/15855006/diff/6001/gyp/core.gyp
File gyp/core.gyp (right):

https://codereview.chromium.org/15855006/diff/6001/gyp/core.gyp#newcode80
gyp/core.gyp:80: # The code in SkUtilsArm.cpp can be used on an ARM-based Linux
system, not only Android.
remove this

https://codereview.chromium.org/15855006/diff/6001/gyp/images.gyp
File gyp/images.gyp (left):

https://codereview.chromium.org/15855006/diff/6001/gyp/images.gyp#oldcode109
gyp/images.gyp:109: 'sources': [
let's not include these modifications as they look to be specific to other
platforms.

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDevice.h
File include/pdf/SkPDFDevice.h (right):

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDevice.h#...
include/pdf/SkPDFDevice.h:35: #endif
remove that from this CL

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDocument.h
File include/pdf/SkPDFDocument.h (right):

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDocument....
include/pdf/SkPDFDocument.h:26: #endif
remove

https://codereview.chromium.org/15855006/diff/6001/platform_tools/android/lau...
File platform_tools/android/launcher/skia_launcher.cpp (right):

https://codereview.chromium.org/15855006/diff/6001/platform_tools/android/lau...
platform_tools/android/launcher/skia_launcher.cpp:71: load_library(argv,
"libskia_local.so");
if this returns NULL we should abort and return -1 here

https://codereview.chromium.org/15855006/diff/6001/platform_tools/android/lau...
platform_tools/android/launcher/skia_launcher.cpp:74: void* appLibrary =
load_library(argv, argv[1]);
same here

https://codereview.chromium.org/15855006/diff/6001/src/pdf/SkTSet.h
File src/pdf/SkTSet.h (right):

https://codereview.chromium.org/15855006/diff/6001/src/pdf/SkTSet.h#newcode15
src/pdf/SkTSet.h:15: 
remove this

[Zach Reizner, 2013-05-31 13:16:38]

made all changes except the ones involving the PDF headers for the reason
stated.

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDevice.h
File include/pdf/SkPDFDevice.h (right):

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDevice.h#...
include/pdf/SkPDFDevice.h:35: #endif
On 2013/05/30 20:35:29, djsollen wrote:
> remove that from this CL

Turns out this is needed to prevent the following error:
type attributes ignored after type is already defined [-Werror=attributes]

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDocument.h
File include/pdf/SkPDFDocument.h (right):

https://codereview.chromium.org/15855006/diff/6001/include/pdf/SkPDFDocument....
include/pdf/SkPDFDocument.h:26: #endif
On 2013/05/30 20:35:29, djsollen wrote:
> remove

Turns out this is needed to prevent the following error:
type attributes ignored after type is already defined [-Werror=attributes]

[djsollen, 2013-05-31 13:38:07]

Eric, can you weigh in on this.

Also to set expectations let's update the common.gypi file to throw an error if
anyone ties to use skia_shared_lib with any platform but android.

[borenet, 2013-05-31 14:29:57]

LGTM for the most part, with a few comments.

https://codereview.chromium.org/15855006/diff/15001/Makefile
File Makefile (right):

https://codereview.chromium.org/15855006/diff/15001/Makefile#newcode48
Makefile:48: skia_lib \
I think it would be nice to have this just be "skia" eventually, but this is
fine for now.

https://codereview.chromium.org/15855006/diff/15001/gyp/skia_lib.gyp
File gyp/skia_lib.gyp (right):

https://codereview.chromium.org/15855006/diff/15001/gyp/skia_lib.gyp#newcode43
gyp/skia_lib.gyp:43: 'product_name': 'skia_local',
Maybe I missed the discussion, but this name doesn't make much sense to me. 
Ideally it would just be "skia" but I suspect that conflicts with something in
Android framework?  If "local" indicates that it's private to skia devs, why not
"skia_private" or "skia_internal"?

https://codereview.chromium.org/15855006/diff/15001/include/pdf/SkPDFDevice.h
File include/pdf/SkPDFDevice.h (right):

https://codereview.chromium.org/15855006/diff/15001/include/pdf/SkPDFDevice.h...
include/pdf/SkPDFDevice.h:34: #ifndef SkTSet_DEFINED
Derek, is this a reasonable thing to do?

https://codereview.chromium.org/15855006/diff/15001/platform_tools/android/gy...
File platform_tools/android/gyp/skia_android.gypi (right):

https://codereview.chromium.org/15855006/diff/15001/platform_tools/android/gy...
platform_tools/android/gyp/skia_android.gypi:16: 'tools.gyp:skimage'
Nit: I really like having the comma after the last element.

[djsollen, 2013-05-31 17:18:58]

https://codereview.chromium.org/15855006/diff/15001/include/pdf/SkPDFDevice.h
File include/pdf/SkPDFDevice.h (right):

https://codereview.chromium.org/15855006/diff/15001/include/pdf/SkPDFDevice.h...
include/pdf/SkPDFDevice.h:34: #ifndef SkTSet_DEFINED
On 2013/05/31 14:29:57, borenet wrote:
> Derek, is this a reasonable thing to do?

Try removing SK_API and the #ifndef

[djsollen, 2013-05-31 19:02:00]

lgtm pending trybot success

[djsollen, 2013-05-31 20:03:18]

Committed patchset #6 manually as r9378 (presubmit successful).

[djsollen, 2013-05-31 20:09:58]

Committed patchset #6 manually as r9379.