Fix native_lib_placeholders gn gen errors in the presense of splits

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 914 matching lines @@
     wrapper_script_args = [
       "-test-jars",
       "$target_name.jar",
     ]
     testonly = true
 
     deps += [
       "//testing/android/junit:junit_test_support",
       "//third_party/junit",
       "//third_party/mockito:mockito_java",
+      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
       "//third_party/robolectric:robolectric_java",
-      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
     ]
   }
 }
 
 # Declare a java library target
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath.
 #
@@ skipping 567 matching lines @@
 
   if (_proguard_enabled) {
     _proguard_configs = [ _generated_proguard_config ]
     if (defined(invoker.proguard_configs)) {
       _proguard_configs += invoker.proguard_configs
     }
     _proguard_target = "${_template_name}__proguard"
     proguard(_proguard_target) {
       deps = [
         ":$build_config_target",
+        ":$java_target",
         ":$process_resources_target",
-        ":$java_target",
       ]
       inputs = [
                  _build_config,
                  _jar_path,
                ] + _proguard_configs
 
       output_jar_path = _proguard_jar_path
       rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
       args = [
         "--proguard-configs=$rebased_proguard_configs",
@@ skipping 120 matching lines @@
     # This target generates the input file _all_resources_zip_path.
     deps += _android_manifest_deps + [
               ":$build_config_target",
               ":$process_resources_target",
               ":$final_dex_target_name",
             ]
 
     if (_native_libs != [] && !_create_abi_split) {
       native_libs_dir = _native_libs_dir
 
-      # Placeholders are not necessary for L+, so add them here, but don't
-      # bother to create them in the case of splits.
+      # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       forward_variables_from(invoker, [ "native_lib_placeholders" ])
 
       deps += [ ":$_prepare_native_target_name" ]
     }
   }
 
   if (_native_libs != [] && _create_abi_split) {
     _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
     generate_split_manifest(_manifest_rule) {
@@ skipping 16 matching lines @@
       load_library_from_apk = _load_library_from_apk
 
       version_code = _version_code
       version_name = _version_name
 
       keystore_name = _keystore_name
       keystore_path = _keystore_path
       keystore_password = _keystore_password
 
       native_libs_dir = _native_libs_dir
+
+      # Placeholders necessary for some older devices.
+      # http://crbug.com/395038
+      forward_variables_from(invoker, [ "native_lib_placeholders" ])
+
       deps = [
+        ":${_manifest_rule}",
         ":${_prepare_native_target_name}",
-        ":${_manifest_rule}",
       ]
       incremental_deps = deps
     }
   }
 
   _create_incremental_script_rule_name = "${_template_name}__incremental_script"
   action(_create_incremental_script_rule_name) {
     script = "//build/android/incremental_install/create_install_script.py"
     depfile = "$target_gen_dir/$target_name.d"
     deps = [
@@ skipping 40 matching lines @@
     data_deps = []
     forward_variables_from(invoker, [ "data_deps" ])
 
     # device/commands is used by the installer script to push files via .zip.
     data_deps += [ "//build/android/pylib/device/commands" ]
 
     # Since the _incremental.apk does not include use .so nor .dex from the
     # actual target, but instead loads them at runtime, we need to explicitly
     # depend on them here.
     public_deps = [
+      ":${_create_incremental_script_rule_name}",
       ":${_template_name}__create_incremental",
-      ":${_create_incremental_script_rule_name}",
       ":${java_target}",
     ]
     if (_native_libs != []) {
       public_deps += [ ":$_prepare_native_target_name" ]
     }
   }
 }
 
 # Declare an Android instrumentation test apk
 #
@@ skipping 384 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }