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

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 647 matching lines @@
 
 # Creates an unsigned .apk.
 #
 # Variables
 #   assets_build_config: Path to android_apk .build_config containing merged
 #       asset information.
 #   deps: Specifies the dependencies of this target.
 #   dex_path: Path to classes.dex file to include (optional).
 #   resource_packaged_apk_path: Path to .ap_ to use.
 #   output_apk_path: Output path for the generated .apk.
+#   native_libs: List of .so files to include.
 #   native_lib_placeholders: List of placeholder filenames to add to the apk
 #     (optional).
 #   native_libs_dir: Directory containing native libraries.
 #   write_asset_list: Adds an extra file to the assets, which contains a list of

[pkotwicz, 2015/11/26 21:17:45]

Let's get rid of this in this CL.

Usually, I am against big CLs but having both native_libs & native_libs_dir is
just too confusing

 #     all other asset files.
 template("package_apk") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "public_deps",
                              "testonly",
                            ])
     _native_lib_placeholders = []
@@ skipping 38 matching lines @@
         "--uncompressed-assets=@FileArg($_rebased_build_config:uncompressed_assets)",
       ]
     }
     if (defined(invoker.write_asset_list) && invoker.write_asset_list) {
       args += [ "--write-asset-list" ]
     }
     if (defined(invoker.dex_path)) {
       _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
       args += [ "--dex-file=$_rebased_dex_path" ]
     }
-    if (defined(invoker.native_libs_dir) || _native_lib_placeholders != []) {
+    if (defined(invoker.native_libs_dir) || defined(invoker.native_libs) ||
+        _native_lib_placeholders != []) {
       args += [ "--android-abi=$android_app_abi" ]
     }
     if (defined(invoker.native_libs_dir)) {
       _rebased_native_libs_dir =
           rebase_path(invoker.native_libs_dir, root_build_dir)
       args += [ "--native-libs-dir=$_rebased_native_libs_dir/$android_app_abi" ]
     }
+    if (defined(invoker.native_libs)) {
+      _rebased_native_libs = rebase_path(invoker.native_libs, root_build_dir)
+      args += [ "--native-libs=$_rebased_native_libs" ]
+    }
     if (_native_lib_placeholders != []) {
       args += [ "--native-lib-placeholders=$_native_lib_placeholders" ]
     }
 
     if (defined(invoker.emma_instrument) && invoker.emma_instrument) {
       _emma_device_jar = "$android_sdk_root/tools/lib/emma_device.jar"
       _rebased_emma_device_jar = rebase_path(_emma_device_jar, root_build_dir)
       args += [ "--emma-device-jar=$_rebased_emma_device_jar" ]
     }
   }
@@ skipping 259 matching lines @@
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
                              "native_lib_placeholders",
+                             "native_libs",
                              "native_libs_dir",
                              "write_asset_list",
                            ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
 
     output_apk_path = _packaged_apk_path
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _incremental_package_target = "${target_name}_incremental__package"
   package_apk(_incremental_package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
+                             "native_libs",

[pkotwicz, 2015/11/26 21:17:45]

Please add a comment as to why you are including native_libs
Please also rename native_libs variable. optionally_loadable_native_libs
perhaps?

                            ])
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
     deps = _incremental_deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
@@ skipping 943 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }