diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-11-16 12:47:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-16 20:48:27 +0000 |
| commit | ca8ee920c100d98f3bddbc50452eb2906064bf92 (patch) | |
| tree | cdf06027e0a5ef566879376cdbabc43464b4d382 | |
| parent | 443bd11bc8106bea98a89819b7bb1b35d6e5ddf8 (diff) | |
| download | chromium_src-ca8ee920c100d98f3bddbc50452eb2906064bf92.zip chromium_src-ca8ee920c100d98f3bddbc50452eb2906064bf92.tar.gz chromium_src-ca8ee920c100d98f3bddbc50452eb2906064bf92.tar.bz2 | |
Make it possible to turn off load_library_from_zip via GYP_DEFINES
BUG=535389
Review URL: https://codereview.chromium.org/1420403007
Cr-Commit-Position: refs/heads/master@{#359905}
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index b7b31a8..f5df8f3 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -207,7 +207,7 @@ # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip': 1, + 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', }], ], }, @@ -247,7 +247,7 @@ # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip': 1, + 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', }], ], }, |