Port android_aapt_path, app_as_shared_lib and alternative_sdk to GN

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/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 561 matching lines @@
 #     |generated_resource_dirs| must be specified in |generated_resource_files|
 #     is specified.
 #   android_manifest: AndroidManifest.xml for this target. Defaults to
 #     //build/android/AndroidManifest.xml.
 #   custom_package: java package for generated .java files.
 #   v14_skip: If true, don't run v14 resource generator on this. Defaults to
 #     false. (see build/android/gyp/generate_v14_compatible_resources.py)
 #
 #   shared_resources: If true make a resource package that can be loaded by a
 #     different application at runtime to access the package's resources.
 #

[agrieve, 2015/12/30 15:12:16]

nit: Remove blank line (feel free to remove the one above shared_resources as
well)

[michaelbai, 2015/12/30 18:54:15]

Done.

+#   app_as_shared_lib: If true make a resource package that can be loaded as
+#     both shared_resources and normal application.
 
 # Example:
 #   android_resources("foo_resources") {
 #     deps = [":foo_strings_grd"]
 #     resource_dirs = ["res"]
 #     custom_package = "org.chromium.foo"
 #   }
 #
 #   android_resources("foo_resources_overrides") {
 #     deps = [":foo_resources"]
@@ skipping 35 matching lines @@
     type = "android_resources"
     resources_zip = zip_path
     srcjar = srcjar_path
   }
 
   process_resources(process_resources_target_name) {
     visibility = [ ":$final_target_name" ]
     deps = []
     forward_variables_from(invoker,
                            [
+                             "app_as_shared_lib",
                              "android_manifest",
                              "custom_package",
                              "deps",
                              "generated_resource_dirs",
                              "generated_resource_files",
                              "resource_dirs",
                              "shared_resources",
                              "v14_skip",
                            ])
     deps += [ ":$build_config_target_name" ]
@@ skipping 527 matching lines @@
     requires_android = true
   }
 }
 
 # Declare an Android apk target
 #
 # This target creates an Android APK containing java code, resources, assets,
 # and (possibly) native libraries.
 #
 # Variables
+#   alternative_android_sdk_jar: The alternative android sdk jar used in
+#     proguard.
+#   android_aapt_path: Android aapt tool to replace default one to build
+#     resource.
 #   android_manifest: Path to AndroidManifest.xml.
 #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   data_deps: List of dependencies needed at runtime. These will be built but
 #     won't change the generated .apk in any way (in fact they may be built
 #     after the .apk is).
 #   deps: List of dependencies. All Android java resources and libraries in the
 #     "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
@@ skipping 207 matching lines @@
     native_libs = _native_libs
   }
 
   _final_deps = []
 
   _generated_proguard_config = "$base_path.resources.proguard.txt"
   process_resources_target = "${_template_name}__process_resources"
   process_resources(process_resources_target) {
     forward_variables_from(invoker,
                            [
+                             "android_aapt_path",
+                             "app_as_shared_lib",
                              "include_all_resources",
                              "shared_resources",
                            ])
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     r_text_path = "${target_gen_dir}/${target_name}_R.txt"
     android_manifest = _android_manifest
     resource_dirs = [ "//build/android/ant/empty/res" ]
     zip_path = resources_zip_path
     all_resources_zip_path = _all_resources_zip_path
     generate_constant_ids = true
@@ skipping 128 matching lines @@
                  _jar_path,
                ] + _proguard_configs
 
       output_jar_path = _proguard_jar_path
       rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
       args = [
         "--proguard-configs=$rebased_proguard_configs",
         "--tested-apk-info=@FileArg($_rebased_build_config:proguard:tested_apk_info)",
         "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
       ]
+      if (defined(invoker.alternative_android_sdk_jar)) {

[agrieve, 2015/12/30 15:12:16]

nit: use forward_variables_from()

[michaelbai, 2015/12/30 18:54:15]

Done.

+        alternative_android_sdk_jar = invoker.alternative_android_sdk_jar
+      }
     }
     _dex_sources = [ _proguard_jar_path ]
     _dex_deps = [ ":$_proguard_target" ]
   } else {
     if (enable_multidex) {
       _dex_sources = [ _jar_path ]
     } else {
       _dex_sources = [ _lib_dex_path ]
     }
     _dex_deps = [ ":$java_target" ]
@@ skipping 92 matching lines @@
   }
   if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
     _extra_native_libs_even_when_incremental += invoker.loadable_modules
   }
 
   _final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
     deps = []
     forward_variables_from(invoker,
                            [
+                             "android_aapt_path",
+                             "app_as_shared_lib",
                              "deps",
                              "extensions_to_not_compress",
                              "language_splits",
                              "public_deps",
                              "shared_resources",
                              "write_asset_list",
                            ])
     apk_path = _final_apk_path
     android_manifest = _android_manifest
     assets_build_config = _build_config
@@ skipping 72 matching lines @@
 
       keystore_name = _keystore_name
       keystore_path = _keystore_path
       keystore_password = _keystore_password
 
       # Placeholders necessary for some older devices.
       # http://crbug.com/395038
       deps = []
       forward_variables_from(invoker,
                              [
+                               "android_aapt_path",
                                "deps",
                                "native_lib_placeholders",
                                "public_deps",
                              ])
 
       incremental_deps = deps + _extra_native_libs_even_when_incremental_deps +
                          [ ":$_manifest_rule" ]
       deps = []
       deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps +
              [ _native_libs_file_arg_dep ]
@@ skipping 461 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }