diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-12-10 17:18:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 01:19:09 +0000 |
| commit | 25ed7e25ed0728b14aaa3129d5f6dbe3bb86bd65 (patch) | |
| tree | 0da11ac32bb2908bef8d92a31b1b3c5019752702 /android_webview | |
| parent | ed698a70b951776aac2af82e3d7c73c6d201e1b8 (diff) | |
| download | chromium_src-25ed7e25ed0728b14aaa3129d5f6dbe3bb86bd65.zip chromium_src-25ed7e25ed0728b14aaa3129d5f6dbe3bb86bd65.tar.gz chromium_src-25ed7e25ed0728b14aaa3129d5f6dbe3bb86bd65.tar.bz2 | |
passes in the native library name into apk_merger
BUG=546181
Review URL: https://codereview.chromium.org/1450143002
Cr-Commit-Position: refs/heads/master@{#364557}
Diffstat (limited to 'android_webview')
| -rwxr-xr-x | android_webview/tools/apk_merger.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/tools/apk_merger.py b/android_webview/tools/apk_merger.py index a8aa44d..c9727d9 100755 --- a/android_webview/tools/apk_merger.py +++ b/android_webview/tools/apk_merger.py @@ -150,6 +150,7 @@ def main(): parser.add_argument('--keystore_path', required=True, type=os.path.abspath) parser.add_argument('--key_name', required=True) parser.add_argument('--key_password', required=True) + parser.add_argument('--shared_library', required=True) args = parser.parse_args() tmp_dir = tempfile.mkdtemp() @@ -163,7 +164,7 @@ def main(): # setting the compression level of the file expected_files = {'snapshot_blob_32.bin': ['-0'], 'natives_blob_32.bin': ['-0'], - 'libwebviewchromium.so': []} + args.shared_library: []} try: shutil.copyfile(args.apk_64bit, tmp_apk) |