Rename load_library_from_zip_file -> load_library_from_zip

Having load_library_from_zip_file end with "_file" causes a GYP
exception when the value is overriden.

BUG=488135

Review URL: https://codereview.chromium.org/1142353003

Cr-Commit-Position: refs/heads/master@{#330888}

build/android/finalize_apk_action.gypi

@@ -43,7 +43,7 @@
     '--key-path=<(keystore_path)',
     '--key-name=<(keystore_name)',
     '--key-passwd=<(keystore_password)',
-    '--load-library-from-zip-file=<(load_library_from_zip)',
+    '--load-library-from-zip=<(load_library_from_zip)',
     '--rezip-apk-jar-path=<(rezip_apk_jar_path)',
   ],
 }

build/android/gyp/finalize_apk.py

@@ -79,7 +79,7 @@ def main():
   parser.add_option('--key-passwd', help='Keystore password')
   parser.add_option('--key-name', help='Keystore name')
   parser.add_option('--stamp', help='Path to touch on success.')
-  parser.add_option('--load-library-from-zip-file', type='int',
+  parser.add_option('--load-library-from-zip', type='int',
       help='If non-zero, build the APK such that the library can be loaded ' +
            'directly from the zip file using the crazy linker. The library ' +
            'will be renamed, uncompressed and page aligned.')
@@ -89,7 +89,7 @@ def main():
   with tempfile.NamedTemporaryFile() as signed_apk_path_tmp, \
       tempfile.NamedTemporaryFile() as apk_to_sign_tmp:
 
-    if options.load_library_from_zip_file:
+    if options.load_library_from_zip:
       # We alter the name of the library so that the Android Package Manager
       # does not extract it into a separate file. This must be done before
       # signing, as the filename is part of the signed manifest. At the same
@@ -106,7 +106,7 @@ def main():
     JarSigner(options.key_path, options.key_name, options.key_passwd,
               apk_to_sign, signed_apk_path)
 
-    if options.load_library_from_zip_file:
+    if options.load_library_from_zip:
       # Reorder the contents of the APK. This re-establishes the canonical
       # order which means the library will be back at its page aligned location.
       # This step also aligns uncompressed items to 4 bytes.

build/android/rezip/RezipApk.java

@@ -323,7 +323,7 @@ class RezipApk {
                     throw new UnsupportedOperationException(
                             "Found more than one library\n"
                             + "Multiple libraries are not supported for APKs that use "
-                            + "'load_library_from_zip_file'.\n"
+                            + "'load_library_from_zip'.\n"
                             + "See crbug/388223.\n"
                             + "Note, check that your build is clean.\n"
                             + "An unclean build can incorrectly incorporate old "

build/config/android/internal_rules.gni

@@ -629,7 +629,7 @@ template("create_apk") {
       _rezip_jar_path = "$root_build_dir/lib.java/rezip_apk.jar"
       inputs += [ _rezip_jar_path ]
       args += [
-        "--load-library-from-zip-file=1",
+        "--load-library-from-zip=1",
         "--rezip-apk-jar-path",
         rebase_path(_rezip_jar_path, root_build_dir),
       ]

build/java_apk.gypi

@@ -51,7 +51,7 @@
 #    R.java files.
 #  use_chromium_linker - Enable the content dynamic linker that allows sharing the
 #    RELRO section of the native libraries between the different processes.
-#  load_library_from_zip_file - When using the dynamic linker, load the library
+#  load_library_from_zip - When using the dynamic linker, load the library
 #    directly out of the zip file.
 #  use_relocation_packer - Enable relocation packing. Relies on the chromium
 #    linker, so use_chromium_linker must also be enabled.
@@ -189,7 +189,7 @@
     'native_lib_target%': '',
     'native_lib_version_name%': '',
     'use_chromium_linker%' : 0,
-    'load_library_from_zip_file%' : 0,
+    'load_library_from_zip%' : 0,
     'use_relocation_packer%' : 0,
     'enable_chromium_linker_tests%': 0,
     'emma_instrument%': '<(emma_instrument)',
@@ -306,7 +306,7 @@
                   'linker_gcc_preprocess_defines': [],
                 },
               }],
-              ['load_library_from_zip_file == 1', {
+              ['load_library_from_zip == 1', {
                 'variables': {
                   'linker_load_from_zip_file_preprocess_defines': [
                     '--defines', 'ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE',
@@ -542,7 +542,6 @@
             'conditions': [
               ['create_abi_split == 0', {
                 'input_apk_path': '<(unsigned_standalone_apk_path)',
-                'load_library_from_zip': '<(load_library_from_zip_file)',
               }, {
                 'input_apk_path': '<(unsigned_apk_path)',
                 'load_library_from_zip': 0,
@@ -597,7 +596,6 @@
         {
           'action_name': 'finalize_split',
           'variables': {
-            'load_library_from_zip': '<(load_library_from_zip_file)',
             'output_apk_path': '<(final_abi_split_apk_path)',
             'conditions': [
               ['gyp_managed_install == 1', {