Android: Disable load_library_from_apk when increment_install=true

We couldn't do this when increment_install was not a GN arg, but it's
easy to do now that it is :).

Bug: None
Change-Id: I42c243fa530e448158405bf4157016f578f319ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2573011
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833817}

base/android/linker/config.gni

@@ -9,5 +9,8 @@ import("//build/config/sanitizers/sanitizers.gni")
 # Chromium linker doesn't reliably support loading multiple libraries;
 # disable for component builds, see crbug.com/657093.
 # Chromium linker causes instrumentation to return incorrect results.
+# Incompatible with incremental_install because it causes LibraryLoader to not
+# look for the .so files in their side-loaded location.
 chromium_linker_supported =
-    !is_component_build && !enable_profiling && !use_order_profiling && !is_asan
+    !incremental_install && !is_component_build && !enable_profiling &&
+    !use_order_profiling && !is_asan

build/android/incremental_install/installer.py

@@ -152,9 +152,6 @@ def Install(device, install_json, apk=None, enable_device_cache=False,
   else:
     install_dict = install_json
 
-  if install_dict.get('dont_even_try'):
-    raise Exception(install_dict['dont_even_try'])
-
   main_timer = time_profile.TimeProfile()
   install_timer = time_profile.TimeProfile()
   push_native_timer = time_profile.TimeProfile()

build/android/incremental_install/write_installer_json.py

@@ -42,8 +42,6 @@ def _ParseArgs(args):
                       action='store_true',
                       default=False,
                       help='Print a warning about proguard being disabled')
-  parser.add_argument('--dont-even-try',
-                      help='Prints the given message and exits.')
 
   options = parser.parse_args(args)
   options.dex_files = build_utils.ParseGnList(options.dex_files)
@@ -58,7 +56,6 @@ def main(args):
       'apk_path': options.apk_path,
       'native_libs': options.native_libs,
       'dex_files': options.dex_files,
-      'dont_even_try': options.dont_even_try,
       'show_proguard_warning': options.show_proguard_warning,
       'split_globs': options.split_globs,
   }

build/config/android/rules.gni

@@ -3267,9 +3267,6 @@ if (enable_java_templates) {
               rebase_path(_loadable_modules, root_build_dir)
           args += [ "--native-libs=$_rebased_loadable_modules" ]
         }
-        if (_load_library_from_apk) {
-          args += [ "--dont-even-try=Incremental builds do not work with load_library_from_apk. Try setting is_component_build=true in your GN args." ]
-        }
       }
       _final_deps += [
         ":$_java_target",