Add rename and inflate support to the RezipApk tool.

Add rename and inflate support to the RezipApk tool.

This removes the need to use the previous "rezip" tool in the build
process. That tool is still used in the LGPL compliance script,
which will need to be addressed separately.

BUG=390618, 388223
Committed: https://crrev.com/5887c778a800c9000e9565b40da65e9979657afd
Cr-Commit-Position: refs/heads/master@{#297866}

[Anton, 2014-10-01 15:50:40]

anton@chromium.org changed reviewers:
+ rmcilroy@chromium.org

[rmcilroy, 2014-10-02 12:22:36]

looks good overall, one question about the file comparator.

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
File build/android/rezip/RezipApk.java (right):

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:68: return filename;
I think this should be an exceptino rather than just silently returning the same
value, wdyt?

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:133: private static List<String>
orderFilenames(
nit - rename to getOutputFileOrder()

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:134: JarFile jar, boolean omitMetaFiles,
boolean rename) {
alignment...

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:152: outNames.add(outName);
Could you not do this in the Comparator (e.g., compare based on the outName if
it is a library filename)?  This would avoid having to rebuild the inName array
(since you would just be sorting a single array of input names but based on
output names).

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:319: boolean isCrazy = false;
This should just be local to the loop I think.

[Anton, 2014-10-02 14:43:54]

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
File build/android/rezip/RezipApk.java (right):

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:68: return filename;
On 2014/10/02 12:22:36, rmcilroy wrote:
> I think this should be an exceptino rather than just silently returning the
same
> value, wdyt?

I just removed it. This kind of defensive programming makes more sense in the
C++ code it was based on, in Java it just looks like clutter.

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:133: private static List<String>
orderFilenames(
On 2014/10/02 12:22:36, rmcilroy wrote:
> nit - rename to getOutputFileOrder()

Done. Now getOutputFileOrderEntries() as it now returns entries.

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:134: JarFile jar, boolean omitMetaFiles,
boolean rename) {
On 2014/10/02 12:22:36, rmcilroy wrote:
> alignment...

Done.

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:152: outNames.add(outName);
On 2014/10/02 12:22:36, rmcilroy wrote:
> Could you not do this in the Comparator (e.g., compare based on the outName if
> it is a library filename)?  This would avoid having to rebuild the inName
array
> (since you would just be sorting a single array of input names but based on
> output names).

I have done this, but I don't know whether you realised that this means sorting
JarEntry rather than filenames. We need the header (JarEntry) to avoid renaming
those zero length libraries.

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:319: boolean isCrazy = false;
On 2014/10/02 12:22:36, rmcilroy wrote:
> This should just be local to the loop I think.

Done.

[rmcilroy, 2014-10-02 15:29:37]

lgtm, thanks!  

Can we get rid of the old rezip tool now that you've updated the LGPL steps?

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
File build/android/rezip/RezipApk.java (right):

https://codereview.chromium.org/608853005/diff/20001/build/android/rezip/Rezi...
build/android/rezip/RezipApk.java:152: outNames.add(outName);
On 2014/10/02 14:43:54, Anton wrote:
> On 2014/10/02 12:22:36, rmcilroy wrote:
> > Could you not do this in the Comparator (e.g., compare based on the outName
if
> > it is a library filename)?  This would avoid having to rebuild the inName
> array
> > (since you would just be sorting a single array of input names but based on
> > output names).
> 
> I have done this, but I don't know whether you realised that this means
sorting
> JarEntry rather than filenames. We need the header (JarEntry) to avoid
renaming
> those zero length libraries. 

I think this is still better, thanks.

[Anton, 2014-10-02 17:07:38]

The CQ bit was checked by anton@chromium.org

[commit-bot: I haz the power, 2014-10-02 17:07:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/608853005/40001

[commit-bot: I haz the power, 2014-10-02 18:20:26]

Committed patchset #3 (id:40001) as 0c81284f3a9af4f73bf7e80be1a9ef0bf31a2bc9

[commit-bot: I haz the power, 2014-10-02 18:21:27]

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