GN(Android): Add libosmesa.so to ContentShell.apk

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 1173 matching lines @@
 #     "transitive closure" of these dependencies will be included in the apk.
 #     Note: this "transitive closure" actually only includes such targets if
 #     they are depended on through android_library or android_resources targets
 #     (and so not through builtin targets like 'action', 'group', etc).
 #   java_files: List of .java files to include in the apk.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
 #   apk_name: Name for final apk.
 #   final_apk_path: Path to final built apk. Default is
 #     $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
+#   loadable_modules: List of paths to native libraries to include. Different
+#     from |native_libs| in that:
+#       * dependencies of this .so are not automatically included,
+#       * ".cr.so" is never added
+#       * load_library_from_apk and enable_relocation_packing do not apply
+#       * not side-loaded for _incremental targets.
+#     Use this instead of native_libs when you are going to load the library
+#     conditionally, and only when native_libs doesn't work for you.
 #   native_libs: List paths of native libraries to include in this apk. If these
 #     libraries depend on other shared_library targets, those dependencies will
-#     also be included in the apk.
+#     also be included in the apk. When building with is_component_build,
+#     The extension is automatically changed to ".cr.so".
 #   native_lib_placeholders: List of placeholder filenames to add to the apk
 #     (optional).
 #   apk_under_test: For an instrumentation test apk, this is the target of the
 #     tested apk.
 #   include_all_resources - If true include all resource IDs in all generated
 #     R.java files.
 #   testonly: Marks this target as "test-only".
 #   write_asset_list: Adds an extra file to the assets, which contains a list of
 #     all other asset files.
 #
@@ skipping 54 matching lines @@
           [ _final_apk_path ],
           "$root_build_dir/test.lib.java/{{source_name_part}}.jar")
   _dist_jar_path = _dist_jar_path_list[0]
   _final_apk_path_no_ext_list =
       process_file_template([ _final_apk_path ],
                             "{{source_dir}}/{{source_name_part}}")
   _final_apk_path_no_ext = _final_apk_path_no_ext_list[0]
   assert(_final_apk_path_no_ext != "")  # Mark as used.
 
   _native_libs = []
+  _loadable_modules = []
+  if (defined(invoker.loadable_modules)) {
+    _loadable_modules = invoker.loadable_modules
+  }
 
   _version_code = "1"
   if (defined(invoker.version_code)) {
     _version_code = invoker.version_code
   }
 
   _version_name = "Developer Build"
   if (defined(invoker.version_name)) {
     _version_name = invoker.version_name
   }
@@ skipping 407 matching lines @@
                          ":$process_resources_target",
                        ]
 
     # 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) {
+    if ((_native_libs != [] || _loadable_modules != []) && !_create_abi_split) {
       native_libs_dir = _native_libs_dir
+      native_libs = _loadable_modules
 
       # 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) {
+  if ((_native_libs != [] || _loadable_modules != []) && _create_abi_split) {
     _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
     generate_split_manifest(_manifest_rule) {
       main_manifest = _android_manifest
       out_manifest =
           "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml"
       split_name = "abi_${android_app_abi}"
       deps = _android_manifest_deps
     }
 
     _apk_rule = "${_template_name}__split_apk_abi_${android_app_abi}"
     _final_deps += [ ":$_apk_rule" ]
 
     create_apk(_apk_rule) {
       apk_path = "${_final_apk_path_no_ext}-abi-${android_app_abi}.apk"
       base_path = "$gen_dir/$_apk_rule"
 
       manifest_outputs = get_target_outputs(":${_manifest_rule}")
       android_manifest = manifest_outputs[1]
       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
+      native_libs = _loadable_modules
 
       # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       forward_variables_from(invoker, [ "native_lib_placeholders" ])
 
       deps = [
         ":${_manifest_rule}",
         ":${_prepare_native_target_name}",
       ]
       incremental_deps = deps
@@ skipping 447 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }