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

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 2567d86315cc623d7c4e5cdfa4383ecd452bacd0..f733cd97d533464ba66ea7e9316375f38296ea59 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -665,6 +665,7 @@ template("emma_instr") {
 #   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.
@@ -727,7 +728,8 @@ template("package_apk") {
       _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)) {
@@ -735,6 +737,10 @@ template("package_apk") {
           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" ]
     }
@@ -1014,6 +1020,7 @@ template("create_apk") {
                              "assets_build_config",
                              "emma_instrument",
                              "native_lib_placeholders",
+                             "native_libs",
                              "native_libs_dir",
                              "write_asset_list",
                            ])
@@ -1033,6 +1040,7 @@ template("create_apk") {
                            [
                              "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 + [