Add native libraries to gn apks

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("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//tools/grit/grit_rule.gni")
 
 assert(is_android)
 
@@ skipping 219 matching lines @@
       depfile,
       gcc_template_output_pattern
     ]
 
     args = [
       "--depfile", rebase_path(depfile, root_build_dir),
       "--include-path", rebase_path(include_path, root_build_dir),
       "--output", rebase_path(gen_dir, root_build_dir) + "/{{source_name_part}}.java",
       "--template={{source}}",
     ]
+
+    if (defined(invoker.defines)) {
+      foreach(def, invoker.defines) {
+        args += ["--defines", def]
+      }
+    }
   }
 
   apply_gcc_outputs = get_target_outputs(":${target_name}__apply_gcc")
   base_gen_dir = get_label_info(":${target_name}__apply_gcc", "target_gen_dir")
 
   srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
   zip("${target_name}__zip_srcjar") {
     inputs = apply_gcc_outputs
     output = srcjar_path
     base_dir = base_gen_dir
@@ skipping 245 matching lines @@
 #   }
 template("android_apk") {
   gen_dir = "$target_gen_dir/$target_name"
   base_path = "$gen_dir/$target_name"
   build_config = "$base_path.build_config"
   resources_zip_path = "$base_path.resources.zip"
   all_resources_zip_path = "$base_path.resources.all.zip"
   resource_srcjar_path = "$base_path.resources.srcjar"
   jar_path = "$base_path.jar"
   final_dex_path = "$gen_dir/classes.dex"
+  _template_name = target_name
 
-  # Just mark these as used for now.
-  assert(!defined(invoker.native_libs)
-      || invoker.native_libs == [] || true)
+  _native_lib_version_name = ""
+
+  _use_chromium_linker = false
+  _enable_chromium_linker_tests = false
+  _load_library_from_apk = false
+
+  _native_libs_dir = base_path + "/libs"
+  _native_libs = []
+  if (defined(invoker.native_libs)) {
+    _native_libs = invoker.native_libs
+  }
 
   _keystore_path = android_default_keystore_path
   _keystore_name = android_default_keystore_name
   _keystore_password = android_default_keystore_password
 
   if (defined(invoker.keystore_path)) {
     _keystore_path = invoker.keystore_path
     _keystore_name = invoker.keystore_name
     _keystore_password = invoker.keystore_password
   }
 
-  # TODO(cjhopman): Remove this once we correctly generate the real
-  # NativeLibraries.java
-  srcjar_deps = [ "//base:base_native_libraries_gen" ]
+  _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
-    srcjar_deps += invoker.srcjar_deps
+    _srcjar_deps += invoker.srcjar_deps
   }
 
+  _rebased_build_config = rebase_path(build_config, root_build_dir)
+
   write_build_config("${target_name}__build_config") {
     type = "android_apk"
     srcjar = resource_srcjar_path
     dex_path = final_dex_path
     resources_zip = resources_zip_path
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
+
+    native_libs = _native_libs
   }
 
   final_deps = []
 
   final_deps += [":${target_name}__process_resources"]
   process_resources("${target_name}__process_resources") {
     android_manifest = invoker.android_manifest
 
     resource_dirs = ["//build/android/ant/empty/res"]
     zip_path = resources_zip_path
     srcjar_path = resource_srcjar_path
 
     generate_constant_ids = true
   }
 
+  java_cpp_template("${target_name}__native_libraries_java") {
+    package_name = "org/chromium/base/library_loader"
+    sources = [
+      "//base/android/java/templates/NativeLibraries.template",
+    ]
+    inputs = [
+      build_config,
+    ]
+
+    defines = [
+      "NATIVE_LIBRARIES_LIST=" +
+        "@FileArg($_rebased_build_config:native:java_libraries_list)",
+      "NATIVE_LIBRARIES_VERSION_NUMBER=\"$_native_lib_version_name\"",
+    ]
+    if (_use_chromium_linker) {
+      defines += ["ENABLED_CHROMIUM_LINKER"]
+    }
+    if (_load_library_from_apk) {
+      defines += ["ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE"]
+    }
+    if (_enable_chromium_linker_tests) {
+      defines += ["ENABLE_CHROMIUM_LINKER_TESTS"]
+    }
+  }
+  _srcjar_deps += [ ":${target_name}__native_libraries_java" ]
+
   rebased_build_config = rebase_path(build_config, root_build_dir)
 
   final_deps += [":${target_name}__java"]
   android_java_library("${target_name}__java") {
     java_files = invoker.java_files
+    srcjar_deps = _srcjar_deps
     dex_path = base_path + ".dex.jar"
   }
 
   final_deps += [":${target_name}__final_dex"]
   dex("${target_name}__final_dex") {
     sources = [jar_path]
     inputs = [build_config]
     output = final_dex_path
     dex_arg_key = "${rebased_build_config}:apk_dex:dependency_dex_files"
     args = ["--inputs=@FileArg($dex_arg_key)"]
   }
 
+  if (_native_libs != []) {
+    copy_ex("${target_name}__prepare_native") {
+      clear_dir = true
+      inputs = [build_config]
+      dest = "$_native_libs_dir/$android_app_abi"
+      args = [
+        "--files=@FileArg(${rebased_build_config}:native:libraries)",
+      ]
+      if (is_debug) {
+        rebased_gdbserver = rebase_path(android_gdbserver, root_build_dir)
+        args += [
+          "--files=[\"$rebased_gdbserver\"]"
+        ]
+      }
+    }
+  }
+
   final_deps += [":${target_name}__create"]
   create_apk("${target_name}__create") {
     apk_path = invoker.final_apk_path
     android_manifest = invoker.android_manifest
     resources_zip = all_resources_zip_path
     dex_path = final_dex_path
 
     keystore_name = _keystore_name
     keystore_path = _keystore_path
     keystore_password = _keystore_password
 
-    # TODO: native libs
+    if (_native_libs != []) {
+      native_libs_dir = _native_libs_dir
+      deps = [":${_template_name}__prepare_native"]
+    }
   }
 
   group(target_name) {
     deps = final_deps
   }
 }
 
 
 # Declare an Android gtest apk
 #
@@ skipping 20 matching lines @@
       "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java"
     ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
     unittests_outputs = get_target_outputs(invoker.unittests_dep)
     native_libs = [unittests_outputs[0]]
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
   }
 }