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.

[pkotwicz, 2015/11/25 01:18:34]

Can you please:
- Explain why someone would want to use this argument (loadable library)
- Mention that people should probably use native_libs instead
- Remove comments about how |loadable_modules| is different from |native_libs|.
From reading the comments I am unable to make a decision which I should use.

[agrieve, 2015/11/25 21:26:57]

Added to the end:
#     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.

I'd like to leave the existing points though, as I do think they help explain
when you'd use it.

 #   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".
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
@@ skipping 52 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 89 matching lines @@
 
   _proguard_enabled =
       defined(invoker.proguard_enabled) && invoker.proguard_enabled
   if (_proguard_enabled) {
     _proguard_jar_path = "$base_path.proguard.jar"
   }
 
   _emma_never_instrument = defined(invoker.testonly) && invoker.testonly
 
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {

[pkotwicz, 2015/11/25 01:18:34]

In GYP, osmesa is written to NativeLibraries.java
I guess that makes the GN version more correct

[agrieve, 2015/11/25 21:26:57]

Acknowledged.

     forward_variables_from(invoker, [ "apk_under_test" ])
     type = "android_apk"
     jar_path = _jar_path
     dex_path = final_dex_path
     apk_path = _final_apk_path
     resources_zip = resources_zip_path
     build_config = _build_config
     android_manifest = _android_manifest
 
     deps = _chromium_linker_dep + _android_manifest_deps
@@ skipping 213 matching lines @@
       ]
 
       inputs = _native_libs
       deps = _chromium_linker_dep
 
       inputs += [ _build_config ]
       deps += [ ":$build_config_target" ]
 
       rebased_gdbserver = rebase_path(android_gdbserver, root_build_dir)
       skip_packing_list = [
         rebased_gdbserver,

[pkotwicz, 2015/11/25 01:18:34]

Can we add the loadable_modules into the APK the same way that we add the
gdbserver into the APK?
This would allow us to keep on using |native_libs| and having to change
apkbuilder.py

[agrieve, 2015/11/25 21:26:57]

Right now incremental install pushes all libs that end up in the output
directory of "prepare_native", so I want to keep the file out of that
intermediate directory.

I'll look into if it's necessary to have gdbserver in there as well though.

[pkotwicz, 2015/11/25 22:41:25]

For the sake of curiosity, why do we want to exclude libosmesa.so from the list
of pushed libraries during incremental install?

The package_apk() invocation for incremental installs does not forward
native_libs_dir to the package_apk() template. Is see that this CL forwards
native_libs

[agrieve, 2015/11/26 03:11:08]

okay, learned about gdbserver and it looks like I should be changing it to do
the same as what loadable_modules is doing here (always add it to the apk).

when debugging via adb_gdb, it's not used, but when debugging via Android Studio
/ Eclipse, it assumes that it's there.

Will address in a follow-up

         "libchromium_android_linker.so",
       ]
 
       enable_packing_arg = 0
       if (_enable_relocation_packing) {
         enable_packing_arg = 1
         deps += [ relocation_packer_target ]
       }
 
       args = [
@@ skipping 62 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

[pkotwicz, 2015/11/25 01:18:34]

You are right. Having both |native_libs| and |native_lib_dir| is super
confusing. I trust that you will make me happy again soon by removing
|native_libs_dir|

[agrieve, 2015/11/25 21:26:57]

Acknowledged.

 
       # 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 455 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }