[Android] Add option to add additional files to built jars.

[Android] Add option to add additional files to built jars.

Adding this to support building Robolectric 3.0 in Chromium.
Robolectric has several .properties files and several native
libraries that would be best to include in some of the
Robolectric jars.

BUG=

Committed: https://crrev.com/5f2924f3f0b3c5070c8c192174e7680573ffb12c
Cr-Commit-Position: refs/heads/master@{#406871}

[mikecase (-- gone --), 2016-06-09 00:34:23]

mikecase@chromium.org changed reviewers:
+ jbudorick@chromium.org

[mikecase (-- gone --), 2016-06-09 00:34:24]

To be specific, Robolectric needs robolectric.properties,
robolectric-version.properties, and a bunch of the sqlite4java .so files to be
on the classpath. Robolectric just packages all these things into various jars
and it would be simplest to just do the same.

[jbudorick, 2016-06-09 19:42:00]

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/jar.py
File build/android/gyp/jar.py (right):

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/jar.py#ne...
build/android/gyp/jar.py:41: if not
os.path.exists(os.path.dirname(full_jar_filepath)):
nit: you've got os.path.dirname(full_jar_filepath) twice here. Call it once and
save it.

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py
File build/android/gyp/javac.py (right):

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py#...
build/android/gyp/javac.py:300: 'format <filename>:<path to be placed in jar>.')
Is there a better way to pass these in?

[mikecase (-- gone --), 2016-06-09 22:46:30]

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py
File build/android/gyp/javac.py (right):

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py#...
build/android/gyp/javac.py:300: 'format <filename>:<path to be placed in jar>.')
On 2016/06/09 at 19:42:00, jbudorick wrote:
> Is there a better way to pass these in?

So options:
1. Always put these additional files in the jar base dir or some other dir like
/additional_files/ in the jar.
This will make it so I have to change more in the Robolectric source
(Robolectric looks at specific paths for some of the libraries in the jar)
(https://github.com/robolectric/robolectric/blob/78ef7facd8df6c2c2f8dafedfbc2d...)

2. Think up better syntax for specifying filepath:jar_filepath

3. Leave as is.

Thoughts?

[mikecase (-- gone --), 2016-06-09 22:47:44]

On 2016/06/09 at 22:46:30, mikecase wrote:
> https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py
> File build/android/gyp/javac.py (right):
> 
>
https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/javac.py#...
> build/android/gyp/javac.py:300: 'format <filename>:<path to be placed in
jar>.')
> On 2016/06/09 at 19:42:00, jbudorick wrote:
> > Is there a better way to pass these in?
> 
> So options:
> 1. Always put these additional files in the jar base dir or some other dir
like /additional_files/ in the jar.
> This will make it so I have to change more in the Robolectric source
(Robolectric looks at specific paths for some of the libraries in the jar)
(https://github.com/robolectric/robolectric/blob/78ef7facd8df6c2c2f8dafedfbc2d...)
> 
> 2. Think up better syntax for specifying filepath:jar_filepath
> 
> 3. Leave as is.
> 
> Thoughts?

Should add, the changes I would need to make in Robolectric for 1. would be
pretty simple.

[mikecase (-- gone --), 2016-07-20 21:23:30]

pinging this. 

This CL would be the easiest way to do what I need to do (which is allow
Robolectric to find some native libraries (sqlite4java libraries) and some
.properties config files). I can just shove these files in the Robolectric jar I
build and it works.

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/jar.py
File build/android/gyp/jar.py (right):

https://codereview.chromium.org/2044223005/diff/1/build/android/gyp/jar.py#ne...
build/android/gyp/jar.py:41: if not
os.path.exists(os.path.dirname(full_jar_filepath)):
On 2016/06/09 at 19:42:00, jbudorick wrote:
> nit: you've got os.path.dirname(full_jar_filepath) twice here. Call it once
and save it.

Done

[jbudorick, 2016-07-21 00:12:41]

lgtm w/ optional nits

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/jar.py
File build/android/gyp/jar.py (right):

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/jar.p...
build/android/gyp/jar.py:38: if additional_files:
optional nit: you could eliminate this by doing

  for filepath, jar_filepath in additional_files or []:

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/javac.py
File build/android/gyp/javac.py (right):

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/javac...
build/android/gyp/javac.py:331: if options.additional_jar_files:
optional nit: same

[mikecase (-- gone --), 2016-07-21 15:33:22]

The CQ bit was checked by mikecase@chromium.org

[mikecase (-- gone --), 2016-07-21 15:33:22]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org
Link to the patchset: https://codereview.chromium.org/2044223005/#ps40001
(title: "style nits")

[commit-bot: I haz the power, 2016-07-21 15:33:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-21 16:25:43]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-07-21 16:27:45]

Description was changed from

==========
[Android] Add option to add additional files to built jars.

Adding this to support building Robolectric 3.0 in Chromium.
Robolectric has several .properties files and several native
libraries that would be best to include in some of the
Robolectric jars.

BUG=
==========

to

==========
[Android] Add option to add additional files to built jars.

Adding this to support building Robolectric 3.0 in Chromium.
Robolectric has several .properties files and several native
libraries that would be best to include in some of the
Robolectric jars.

BUG=

Committed: https://crrev.com/5f2924f3f0b3c5070c8c192174e7680573ffb12c
Cr-Commit-Position: refs/heads/master@{#406871}
==========

[commit-bot: I haz the power, 2016-07-21 16:27:46]

Patchset 3 (id:??) landed as
https://crrev.com/5f2924f3f0b3c5070c8c192174e7680573ffb12c
Cr-Commit-Position: refs/heads/master@{#406871}

[mikecase (-- gone --), 2016-07-21 16:32:37]

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/jar.py
File build/android/gyp/jar.py (right):

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/jar.p...
build/android/gyp/jar.py:38: if additional_files:
On 2016/07/21 at 00:12:41, jbudorick wrote:
> optional nit: you could eliminate this by doing
> 
>   for filepath, jar_filepath in additional_files or []:

oooh, I like this style. Done

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/javac.py
File build/android/gyp/javac.py (right):

https://codereview.chromium.org/2044223005/diff/20001/build/android/gyp/javac...
build/android/gyp/javac.py:331: if options.additional_jar_files:
On 2016/07/21 at 00:12:41, jbudorick wrote:
> optional nit: same

ooh, I like this style. Done