Android: allow JNI generator to be used with jarjar.

Android: allow JNI generator to be used with jarjar.

When using jarjar to rename Java packages to avoid name conflicts, the
generated JNI code no longer works as it refers to the old name. Support
using the jarjar remapping list during JNI generation to generate code
that refers to the post-remapping names, since the JNI headers are not
intended to be read by humans anyway.

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202856

[Torne, 2013-05-24 14:38:32]

not LGTM.

This is not ready for commit yet as it just hardcodes one test remapping instead
of parsing the jarjar config, but I wanted to validate the approach. I get the
output I expect with just these changes :)

[Torne, 2013-05-28 13:02:26]

Hi Marcus,

This now looks ready to submit. It's controlled by a command line argument which
can be passed through a newly added gyp variable. I've added a test that covers
the two usages that I expect us to ever need (using @0 and @1 in jarjar rules).

[bulach, 2013-05-28 13:10:21]

lgtm, thanks! just one suggestion below, if not feasible feel free to go ahead
as it is.

https://codereview.chromium.org/15715006/diff/3001/build/jni_generator.gypi
File build/jni_generator.gypi (right):

https://codereview.chromium.org/15715006/diff/3001/build/jni_generator.gypi#n...
build/jni_generator.gypi:33: 'jni_generator_extra_args%': [],
I've seen this "extra args" patterns being abused in other occasions :) would it
be possible to make it explicit as "jni_generator_jarjar_args" ?

[Torne, 2013-05-28 13:12:04]

https://codereview.chromium.org/15715006/diff/3001/build/jni_generator.gypi
File build/jni_generator.gypi (right):

https://codereview.chromium.org/15715006/diff/3001/build/jni_generator.gypi#n...
build/jni_generator.gypi:33: 'jni_generator_extra_args%': [],
On 2013/05/28 13:10:21, bulach wrote:
> I've seen this "extra args" patterns being abused in other occasions :) would
it
> be possible to make it explicit as "jni_generator_jarjar_args" ?

Er, not sure.. it needs to pass "--jarjar /some/path" or nothing, I'm not sure
that we can easily have there be a gyp variable that toggles it on or off..

[Torne, 2013-05-28 13:43:00]

Anyway, I'm not in a rush to submit this (I'm going to test it in the WebView
tree first) so if you can suggest a better way to arrange the option then we can
change it :)

[bulach, 2013-05-28 14:18:10]

lgtm, go for it..

the python file knows to ignore a --jarjar '' so the gyp file could just pass
empty, but anyways, not a big deal..

[Torne, 2013-05-29 10:17:40]

OK, I went with having a variable for the jarjar rules file that defaults to ''
since that does indeed work, and it seems cleaner in practise because gyp does
pathname relativization for you on the variable.

[commit-bot: I haz the power, 2013-05-29 10:18:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/torne@chromium.org/15715006/13001

[commit-bot: I haz the power, 2013-05-29 13:51:25]

Change committed as 202856