Re-invent page aligning libraries in APK file.

build/android/rezip/rezip.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // rezip is a tool which is used to modify zip files. It reads in a
 // zip file and outputs a new zip file after applying various
 // transforms. The tool is used in the Android Chromium build process
 // to modify an APK file (which are zip files). The main application
 // of this is to modify the APK so that the shared library is no
 // longer compressed. Ironically, this saves both transmission and
@@ skipping 489 matching lines @@
   InflatePredicateFun inflate_predicate_fun = NULL;
   AlignFun align_fun = NULL;
   RenameFun rename_fun = NULL;
   bool check_page_align = false;
   if (strcmp("inflatealign", action) == 0) {
     inflate_predicate_fun = &IsCrazyLibraryFilename;
     align_fun = &PageAlignCrazyLibrary;
     check_page_align = true;
   } else if (strcmp("rename", action) == 0) {
     rename_fun = &RenameLibraryForCrazyLinker;
+  } else if (strcmp("renameinflate", action) == 0) {
+    rename_fun = &RenameLibraryForCrazyLinker;
+    inflate_predicate_fun = &IsLibraryFilename;

[rmcilroy, 2014/09/29 11:38:32]

It looks like this is the only option used by the build system any longer. 
Could you remove the other options and just make rezip do this by default?

[Anton, 2014/09/29 16:30:17]

They are used by the LGPL compliance step of the official build bot. Added a
comment so that no one else makes that mistake, since that things is a bit
invisible.

   } else if (strcmp("dropdescriptors", action) == 0) {
     // Minizip does not know about data descriptors, so the default
     // copying action will drop the descriptors. This should be fine
     // as data descriptors are redundant information.
     // Note we need to explicitly drop the descriptors before trying to
     // do alignment otherwise we will miscalculate the position because
     // we don't know about the data descriptors.
   } else {
     LOG(ERROR) << "Usage: <action> should be 'inflatealign', "
                   "'dropdescriptors' or 'rename'";
     exit(1);
   }
 
   if (!Rezip(in_zip_filename,
              out_zip_filename,
              align_fun,
              rename_fun,
              inflate_predicate_fun)) {
     exit(1);
   }
   if (check_page_align && !CheckPageAlignAndOnlyOneLibrary(out_zip_filename)) {
     exit(1);
   }
   return 0;
 }