diff options
| author | anton@chromium.org <anton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 16:59:46 +0000 |
|---|---|---|
| committer | anton@chromium.org <anton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 16:59:46 +0000 |
| commit | 4e4e7ca42413d2f156241df679e52096a318341d (patch) | |
| tree | 8ff2a02c525ec4577ae42b2ee8ab283d278690ef /base/android/java | |
| parent | d4f1f47520bebb06f1f55b8256d3a983a9773105 (diff) | |
| download | chromium_src-4e4e7ca42413d2f156241df679e52096a318341d.zip chromium_src-4e4e7ca42413d2f156241df679e52096a318341d.tar.gz chromium_src-4e4e7ca42413d2f156241df679e52096a318341d.tar.bz2 | |
Add support for uncompress library in APK to the build system
BUG=
Review URL: https://codereview.chromium.org/334413006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android/java')
| -rw-r--r-- | base/android/java/templates/NativeLibraries.template | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/base/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template index da375c6..09b02eb 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 |