Commit Graph

6 Commits

Author SHA1 Message Date
James Willcox
f57fa07cfd Bug 1099345 - Do not run the Android SDK code generator tool in parallel r=nalexander 2014-11-26 17:52:08 -06:00
James Willcox
8f367a5657 Bug 1099345 - Add more descriptive debugging output to the Android SDK code generator r=nalexander
--HG--
extra : rebase_source : 47d675ebe19db1a488498a19834674fe2fd8dc4f
2014-11-26 15:16:08 -06:00
Nick Alexander
34fad47802 Bug 1099345 - Use pattern rule to generate multiple outputs in widget/android/bindings. r=gps
This works around a race condition observed with GENERATED_SOURCES.  A
global solution might be to make GENERATED_SOURCES part of the
'export' tier; this is a smaller fix.

--HG--
rename : widget/android/bindings/mediacodec-classes.txt => widget/android/bindings/MediaCodec-classes.txt
rename : widget/android/bindings/surfacetexture-classes.txt => widget/android/bindings/SurfaceTexture-classes.txt
extra : rebase_source : 073dadd8c1b48ea32f975b2232c2bdeafe315ab4
2014-11-19 11:33:05 -08:00
Nick Alexander
ec8ac4c085 Bug 1099501 - Export and use ANDROID_TOOLS where appropriate. r=snorp,bnicholson
In certain configurations, in particular when installing the Android SDK
using HomeBrew, one sees a configuration with symlinks like:

    [brian@brian-macbook git]$ ls -l /usr/local/Cellar/android-sdk/23.0.2/
    total 72
    ...
    lrwxr-xr-x   1 brian  admin    38 Nov 14 16:39 platforms -> ../../../var/lib/android-sdk/platforms
    ...
    drwxr-xr-x  26 brian  admin   884 Nov 14 17:43 tools

In this case, we have
ANDROID_SDK=/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21.

It is an anti-pattern to use ANDORID_SDK/.. to find other paths in the
tree.  This pattern is used in at least two places:

1) When we try to find
/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21/../../tools,
we end up in the /usr/local/var/lib subtree.  This patch works around
that by exporting and using ANDROID_TOOLS; ANDROID_TOOLS itself is
extracted using path matching, rather than following .. through the
filesystem.

2) We also need to use ANDROID_SDK_ROOT rather than
ANDROID_SDK/../.. through-out.

--HG--
extra : rebase_source : 5e0323a94f2b80550f17a624e16f338cdeec406d
2014-11-17 11:12:00 -08:00
James Willcox
19e70e1a6a Bug 1086693 - Part 3: Don't generate members that are above a given API version r=ckitching 2014-11-13 12:47:23 -06:00
Nick Alexander
133c885122 Bug 1086693 - Part 2: Generate and build Android SDK JNI wrappers. r=gps 2014-11-13 12:47:23 -06:00