Fix Chromium enable_relocation_packing logic

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 1219 matching lines @@
     }
 
     if (defined(invoker.load_library_from_apk) &&
         invoker.load_library_from_apk) {
       _load_library_from_apk = true
       assert(_use_chromium_linker,
              "Loading library from the apk requires use" +
                  " of the Chromium linker.")
     }
 
-    _enable_relocation_packing = false
-    if (defined(invoker.enable_relocation_packing) &&
-        invoker.enable_relocation_packing) {
-      _enable_relocation_packing = relocation_packing_supported
-      assert(_use_chromium_linker,
-             "Relocation packing requires use of the" + " Chromium linker.")
-    }
-
     if (is_component_build) {
       _native_libs += [ "$root_shlib_dir/libc++_shared.so" ]
       _chromium_linker_dep += [ "//build/android:cpplib_stripped" ]
     }
 
     # Allow native_libs to be in the form "foo.so" or "foo.cr.so"
     _first_ext_removed =
         process_file_template(invoker.native_libs, "{{source_name_part}}")
     _native_libs += process_file_template(
             _first_ext_removed,
@@ skipping 213 matching lines @@
       outputs = [
         depfile,
       ]
 
       inputs = _native_libs
       deps = _chromium_linker_dep
 
       inputs += [ _build_config ]
       deps += [ ":$build_config_target" ]
 
+      rebased_gdbserver = rebase_path(android_gdbserver, root_build_dir)
       skip_packing_list = [
-        "gdbserver",
-        "libchromium_android_linker$shlib_extension",
+        rebased_gdbserver,
+        "libchromium_android_linker.so",
       ]
 
       enable_packing_arg = 0
       if (_enable_relocation_packing) {
         enable_packing_arg = 1
         deps += [ relocation_packer_target ]
       }
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--enable-packing=$enable_packing_arg",
         "--exclude-packing-list=$skip_packing_list",
         "--android-pack-relocations",
         rebase_path(relocation_packer_exe, root_build_dir),
         "--stripped-libraries-dir",
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(packed_libraries_dir, root_build_dir),
         "--libraries=@FileArg(${_rebased_build_config}:native:libraries)",
         "--clear-dir",
       ]
 
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
 
       if (is_debug) {
-        rebased_gdbserver = rebase_path([ android_gdbserver ], root_build_dir)
         inputs += [ android_gdbserver ]
         args += [ "--libraries=$rebased_gdbserver" ]
       }
     }
   }
 
   _final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
     deps = []
     forward_variables_from(invoker,
@@ skipping 523 matching lines @@
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }