GN (android): Append ".cr" to component .so's to avoid zygote lib collisions

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("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 1414 matching lines @@
     }
 
     _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.")
     }
 
-    _native_libs = []
     if (is_component_build) {
       _native_libs += [ "$root_out_dir/lib.stripped/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(
-            invoker.native_libs,
-            "$root_build_dir/lib.stripped/{{source_file_part}}")
+            _first_ext_removed,
+            "$root_build_dir/lib.stripped/{{source_name_part}}$android_product_extension")
 
     _native_libs_dir = base_path + "/libs"
 
     if (_use_chromium_linker) {
-      _native_libs +=
-          [ "$root_build_dir/lib.stripped/libchromium_android_linker.so" ]
+      _native_libs += [ "$root_build_dir/lib.stripped/libchromium_android_linker$android_product_extension" ]
     }
 
     _enable_relocation_packing = false
     if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = true
     }
 
     _native_lib_version_rule = ""
     if (defined(invoker.native_lib_version_rule)) {
@@ skipping 190 matching lines @@
       ]
 
       inputs = _native_libs
       deps = _chromium_linker_dep
 
       inputs += [ _build_config ]
       deps += [ ":$build_config_target" ]
 
       skip_packing_list = [
         "gdbserver",
-        "libchromium_android_linker.so",
+        "libchromium_android_linker$android_product_extension",
       ]
 
       enable_packing_arg = 0
       if (_enable_relocation_packing) {
         enable_packing_arg = 1
         deps += [ relocation_packer_target ]
       }
 
       args = [
         "--depfile",
@@ skipping 263 matching lines @@
 
   test_suite_name = get_label_info(invoker.unittests_dep, "name")
 
   # This trivial assert is needed in case both unittests_binary and apk_name
   # are defined, as otherwise test_suite_name would not be used.
   assert(test_suite_name != "")
 
   if (defined(invoker.unittests_binary)) {
     unittests_binary = invoker.unittests_binary
   } else {
-    unittests_binary = "lib" + test_suite_name + ".so"
+    unittests_binary = "lib${test_suite_name}${android_product_extension}"
   }
 
   if (defined(invoker.apk_name)) {
     apk_name = invoker.apk_name
   } else {
     apk_name = test_suite_name
   }
 
   android_apk(target_name) {
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
@@ skipping 264 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }