Add support for uncompress library in APK to the build system

base/android/java/templates/NativeLibraries.template

 // 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.
 
 package org.chromium.base.library_loader;
 
 public class NativeLibraries {
     /**
      * IMPORTANT NOTE: The variables defined here must _not_ be 'final'.
      *
@@ skipping 23 matching lines @@
      * - If the variables were defined as 'final', their value would be
      *   optimized out inside of 'base.jar', and could not be specialized
      *   for every chromium program. This, however, doesn't apply to arrays of
      *   strings, which can be defined as final.
      *
      * This exotic scheme is used to avoid injecting project-specific, or
      * even build-specific, values into the base layer. E.g. this is
      * how the component build is supported on Android without modifying
      * the sources of each and every Chromium-based target.
      */
+
+#if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE) && \
+  !defined(ENABLE_CHROMIUM_LINKER)

[rmcilroy, 2014/06/27 10:48:03]

nit - indent +2

[Anton, 2014/06/27 12:43:24]

Done.

+#error "Must have ENABLE_CHROMIUM_LINKER to enable library in zip file"
+#endif
+
     // Set to true to enable the use of the Chromium Linker.
 #if defined(ENABLE_CHROMIUM_LINKER)
     public static boolean USE_LINKER = true;
 #else
     public static boolean USE_LINKER = false;
 #endif
 
+#if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE)
+    public static boolean USE_LIBRARY_IN_ZIP_FILE = true;
+#else
+    public static boolean USE_LIBRARY_IN_ZIP_FILE = false;
+#endif
+
 #if defined(ENABLE_CHROMIUM_LINKER_TESTS)
     public static boolean ENABLE_LINKER_TESTS = true;
 #else
     public static boolean ENABLE_LINKER_TESTS = false;
 #endif
 
     // This is the list of native libraries to be loaded (in the correct order)
     // by LibraryLoader.java.  The base java library is compiled with no
     // array defined, and then the build system creates a version of the file
     // with the real list of libraries required (which changes based upon which
     // .apk is being built).
     // TODO(cjhopman): This is public since it is referenced by ChromeNativeTestActivity.java
     // directly. The two ways of library loading should be refactored into one.
     public static final String[] LIBRARIES
 #include <native_libraries_array.h>
       ;
     // This is the expected version of the 'main' native library, which is the one that
     // implements the initial set of base JNI functions including
     // base::android::nativeGetVersionName()
     static String VERSION_NUMBER
 #include <native_libraries_version.h>
       ;
 }