diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-11-04 10:39:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-04 18:40:44 +0000 |
| commit | 6fa48576c7dd5b457307f9b1afa8a774d2fb0d56 (patch) | |
| tree | fe522a653482bf3dd207c38b503a363bd65c2e1a /chrome/android/chrome_apk.gyp | |
| parent | 53ebb8d1754501ccc03f07c03a0e24ee227f7b2b (diff) | |
| download | chromium_src-6fa48576c7dd5b457307f9b1afa8a774d2fb0d56.zip chromium_src-6fa48576c7dd5b457307f9b1afa8a774d2fb0d56.tar.gz chromium_src-6fa48576c7dd5b457307f9b1afa8a774d2fb0d56.tar.bz2 | |
Port load_library_from_zip logic for chrome_public_apk from GYP to GN
This CL:
- Ports load_library_from_zip logic for chrome_public_apk from GYP to GN
- Makes the load_library_from_zip logic dependent on whether the
chromium linker is used for simplicity.
load_library_from_zip == 1 is only supported if use_chromium_linker == 1. See:
base/android/java/templates/NativeLibraries.template
- Removes useless 'load_library_from_zip_file'
BUG=535389
Review URL: https://codereview.chromium.org/1429613003
Cr-Commit-Position: refs/heads/master@{#357855}
Diffstat (limited to 'chrome/android/chrome_apk.gyp')
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index e1cf10c..e92491d 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -204,9 +204,8 @@ # Only attempt loading the library from the APK for 64 bit devices # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. - ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)', - 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', + ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { + 'load_library_from_zip': 1, }], ], }, @@ -243,9 +242,8 @@ # Only attempt loading the library from the APK for 64 bit devices # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. - ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)', - 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', + ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { + 'load_library_from_zip': 1, }], ], }, |