Add support for uncompress library in APK to the build system

base/android/java/templates/NativeLibraries.template

Index: base/android/java/templates/NativeLibraries.template
diff --git a/base/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template
index da375c678be0e69c571c7709b79ffb2a415783c7..7b70a87ed8b0d567ecd49790ec225e732a35bf36 100644
--- a/base/android/java/templates/NativeLibraries.template
+++ b/base/android/java/templates/NativeLibraries.template
@@ -41,6 +41,13 @@ public class NativeLibraries {
      * 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)
+#if !defined(ENABLE_CHROMIUM_LINKER)
+// Always enable the chromium linker if the library is in the zip file.
+#define ENABLE_CHROMIUM_LINKER 1

[rmcilroy, 2014/06/19 09:46:12]

I really think this should be an error rather than silently enabling the
chromium linker (see comment below in java_apk.gypi.

[Anton, 2014/06/19 13:39:45]

Made it an error to have both.

+#endif
+#endif
+
     // Set to true to enable the use of the Chromium Linker.
 #if defined(ENABLE_CHROMIUM_LINKER)
     public static boolean USE_LINKER = true;
@@ -48,6 +55,12 @@ public class NativeLibraries {
     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