Port placeholders logic GYP->GN

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/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 527 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_lib_placeholders: List of placeholder filenames to add to the apk
+#     (optional).
 #   native_libs_dir: Directory containing native libraries.
-#   create_placeholder_lib: Whether to add a dummy lib to the apk.
 template("package_apk") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "public_deps",
                              "testonly",
                            ])
-    _create_placeholder_lib = defined(invoker.create_placeholder_lib) &&
-                              invoker.create_placeholder_lib
+    _native_lib_placeholders = []
+    if (defined(invoker.native_lib_placeholders)) {
+      _native_lib_placeholders = invoker.native_lib_placeholders
+    }
 
     script = "//build/android/gyp/apkbuilder.py"
     depfile = "$target_gen_dir/$target_name.d"
     data_deps = [
       "//tools/android/md5sum",
     ]  # Used when deploying APKs
 
     inputs = [
       invoker.resource_packaged_apk_path,
     ]
@@ skipping 22 matching lines @@
           rebase_path(invoker.assets_build_config, root_build_dir)
       args += [
         "--assets=@FileArg($_rebased_build_config:assets)",
         "--uncompressed-assets=@FileArg($_rebased_build_config:uncompressed_assets)",
       ]
     }
     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) || _create_placeholder_lib) {
+    if (defined(invoker.native_libs_dir) || _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 (_create_placeholder_lib) {
-      args += [ "--create-placeholder-lib" ]
+    if (_native_lib_placeholders != []) {
+      args += [ "--native-lib-placeholders=$_native_lib_placeholders" ]
     }
   }
 }
 
 # Signs & zipaligns an apk.
 #
 # Variables
 #   input_apk_path: Path of the .apk to be finalized.
 #   output_apk_path: Output path for the generated .apk.
 #   keystore_path: Path to keystore to use for signing.
@@ skipping 249 matching lines @@
         _incremental_deps + [ ":$_generate_incremental_manifest_target_name" ]
     android_manifest = _incremental_android_manifest
     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",
+                             "native_lib_placeholders",
                              "native_libs_dir",
                            ])
     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" ])
     _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"
     }
 
     # http://crbug.com/384638
     if (defined(invoker.native_libs_dir)) {
-      create_placeholder_lib = true
+      native_lib_placeholders = [ "libfix.crbug.384638.so" ]

[pkotwicz, 2015/11/16 19:28:22]

I think that GYP appends "libfix.crbug.384638.so" to |native_lib_placeholders|

[agrieve, 2015/11/16 19:45:15]

I think that may have just been out of convenience. For the managed install
case, you just need a non-zero number of libs to exist.

     }
 
     output_apk_path = _incremental_packaged_apk_path
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   _finalize_apk_rule_name = "${target_name}__finalize"
   finalize_apk(_finalize_apk_rule_name) {
     input_apk_path = _packaged_apk_path
     output_apk_path = _final_apk_path
@@ skipping 863 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }