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,

[pkotwicz, 2015/12/02 01:33:05]

Nit: Remove trailing comma

[agrieve, 2015/12/02 14:49:52]

Done.

+#       * ".cr.so" is never added
+#       * load_library_from_apk and enable_relocation_packing do not apply

[pkotwicz, 2015/12/02 01:33:05]

use_chromium_linker also does not apply

[agrieve, 2015/12/02 14:49:52]

Done.

+#       * 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 413 matching lines @@
         "--packed-libraries-dir",
         rebase_path(_native_libs_dir, root_build_dir),
         "--libraries=@FileArg(${_rebased_build_config}:native:libraries)",
         "--filelistjson=$_rebased_native_libs_json",
       ]
     }
   }
 
   _extra_native_libs = []
   _extra_native_libs_deps = []
+  _extra_native_libs_even_when_incremental = []
+  _extra_native_libs_even_when_incremental_deps = []
+  assert(_extra_native_libs_even_when_incremental_deps == [])  # Mark as used.
   if (_native_libs != []) {
-    _extra_native_libs_even_when_incremental = []
-    _extra_native_libs_even_when_incremental_deps = []
-
     if (is_debug) {
       _extra_native_libs_even_when_incremental = [ android_gdbserver ]
     }
 
     if (_use_chromium_linker) {
       _extra_native_libs =
           [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
       _extra_native_libs_deps +=
           [ "//base/android/linker:chromium_android_linker" ]
     }
   }
+  if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
+    _extra_native_libs_even_when_incremental += invoker.loadable_modules
+  }
 
   _final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
     deps = []
     forward_variables_from(invoker,
                            [
                              "asset_location",
                              "deps",
                              "extensions_to_not_compress",
                              "language_splits",
@@ skipping 30 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 != [] || _extra_native_libs_even_when_incremental != []) && !_create_abi_split) {
       deps += _native_libs_deps + _extra_native_libs_deps +
               _extra_native_libs_even_when_incremental_deps +
               [ _native_libs_file_arg_dep ]
       native_libs_filearg = _native_libs_file_arg
       native_libs = _extra_native_libs
       native_libs_even_when_incremental =
           _extra_native_libs_even_when_incremental
 
       # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       forward_variables_from(invoker, [ "native_lib_placeholders" ])
     }
   }
 
-  if (_native_libs != [] && _create_abi_split) {
+  if ((_native_libs != [] || _extra_native_libs_even_when_incremental != []) &&
+      _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}"
@@ skipping 493 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }