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..09b02ebf469aad57a3162ef29633655f056aea89 100644 |
--- a/base/android/java/templates/NativeLibraries.template |
+++ b/base/android/java/templates/NativeLibraries.template |
@@ -41,6 +41,12 @@ 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) && \ |
+ !defined(ENABLE_CHROMIUM_LINKER) |
+#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; |
@@ -48,6 +54,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 |