Port android_aapt_path, app_as_shared_lib and alternative_sdk to 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/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
 rebased_android_sdk_build_tools =
     rebase_path(android_sdk_build_tools, root_build_dir)
 
 android_sdk_jar = "$android_sdk/android.jar"
 rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
-android_aapt_path = "$rebased_android_sdk_build_tools/aapt"
+android_default_aapt_path = "$rebased_android_sdk_build_tools/aapt"
 
 android_configuration_name = "Release"
 if (is_debug) {
   android_configuration_name = "Debug"
 }
 
 template("android_lint") {
   set_sources_assignment_filter([])
 
   jar_path = invoker.jar_path
@@ skipping 52 matching lines @@
                            [
                              "deps",
                              "data_deps",
                              "public_deps",
                              "testonly",
                            ])
     script = "//build/android/gyp/proguard.py"
     _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
     _output_jar_path = invoker.output_jar_path
     inputs = [
-      android_sdk_jar,
       _proguard_jar_path,
     ]
+    if (defined(invoker.alternative_android_sdk_jar)) {
+      inputs += [ invoker.alternative_android_sdk_jar ]
+      _rebased_android_sdk_jar =
+          rebase_path(invoker.alternative_android_sdk_jar)
+    } else {
+      inputs += [ android_sdk_jar ]
+      _rebased_android_sdk_jar = rebased_android_sdk_jar
+    }
     if (defined(invoker.inputs)) {
       inputs += invoker.inputs
     }
     depfile = "${target_gen_dir}/${target_name}.d"
     outputs = [
       depfile,
       _output_jar_path,
       "$_output_jar_path.dump",
       "$_output_jar_path.seeds",
       "$_output_jar_path.mapping",
       "$_output_jar_path.usage",
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--proguard-path",
       rebase_path(_proguard_jar_path, root_build_dir),
       "--output-path",
       rebase_path(_output_jar_path, root_build_dir),
       "--classpath",
-      rebased_android_sdk_jar,
+      _rebased_android_sdk_jar,
     ]
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }
 
 template("findbugs") {
   jar_path = invoker.jar_path
 
@@ skipping 735 matching lines @@
   _base_apk_path = _base_path + ".apk_intermediates"
 
   _resource_packaged_apk_path = _base_apk_path + ".ap_"
   _incremental_resource_packaged_apk_path = _base_apk_path + "_incremental.ap_"
   _packaged_apk_path = _base_apk_path + ".unfinished.apk"
   _incremental_packaged_apk_path =
       _base_apk_path + "_incremental.unfinished.apk"
   _shared_resources =
       defined(invoker.shared_resources) && invoker.shared_resources
   assert(_shared_resources || true)  # Mark as used.
+  _app_as_shared_lib =
+      defined(invoker.app_as_shared_lib) && invoker.app_as_shared_lib
+  assert(_app_as_shared_lib || true)  # Mark as used.
+  assert(!(_shared_resources && _app_as_shared_lib))
 
   _keystore_path = invoker.keystore_path
   _keystore_name = invoker.keystore_name
   _keystore_password = invoker.keystore_password
 
   _split_densities = []
   if (defined(invoker.create_density_splits) && invoker.create_density_splits) {
     _split_densities = [
       "hdpi",
       "xhdpi",
@@ skipping 18 matching lines @@
         invoker.android_manifest,
       ]
       if (defined(_resources_zip)) {
         inputs += [ _resources_zip ]
       }
       outputs = [
         depfile,
         invoker.resource_packaged_apk_path,
       ]
 
+      if (defined(invoker.android_aapt_path)) {
+        _android_aapt_path = invoker.android_aapt_path
+      } else {
+        _android_aapt_path = android_default_aapt_path
+      }
+
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--android-sdk",
         rebased_android_sdk,
         "--aapt-path",
-        android_aapt_path,
+        _android_aapt_path,
         "--configuration-name=$android_configuration_name",
         "--android-manifest",
         rebase_path(invoker.android_manifest, root_build_dir),
         "--version-code",
         _version_code,
         "--version-name",
         _version_name,
         "--apk-path",
         rebase_path(invoker.resource_packaged_apk_path, root_build_dir),
       ]
 
       if (defined(_resources_zip)) {
         args += [
           "--resource-zips",
           rebase_path(_resources_zip, root_build_dir),
         ]
       }
       if (_shared_resources) {
         args += [ "--shared-resources" ]
       }
+      if (_app_as_shared_lib) {
+        args += [ "--app-as-shared-lib" ]
+      }
       if (_split_densities != []) {
         args += [ "--create-density-splits" ]
         foreach(_density, _split_densities) {
           outputs += [ "${invoker.resource_packaged_apk_path}_${_density}" ]
         }
       }
       if (_split_languages != []) {
         args += [ "--language-splits=$_split_languages" ]
         foreach(_language, _split_languages) {
           outputs += [ "${invoker.resource_packaged_apk_path}_${_language}" ]
         }
       }
       if (defined(invoker.extensions_to_not_compress)) {
         args += [
           "--no-compress",
           invoker.extensions_to_not_compress,
         ]
       }
     }
   }
 
   _package_resources_target_name = "${target_name}__package_resources"
   package_resources_helper(_package_resources_target_name) {
-    forward_variables_from(invoker, [ "extensions_to_not_compress" ])
+    forward_variables_from(invoker,
+                           [
+                             "android_aapt_path",
+                             "extensions_to_not_compress",
+                           ])
     deps = _deps
     android_manifest = _android_manifest
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _generate_incremental_manifest_target_name =
       "${target_name}_incremental_generate_manifest"
   _incremental_android_manifest =
       get_label_info(_generate_incremental_manifest_target_name,
                      "target_gen_dir") + "/AndroidManifest.xml"
@@ skipping 22 matching lines @@
       args += [ "--disable-isolated-processes" ]
     }
   }
 
   _incremental_package_resources_target_name =
       "${target_name}_incremental__package_resources"
 
   # TODO(agrieve): See if we can speed up this step by swapping the manifest
   # from the result of the main package_resources step.
   package_resources_helper(_incremental_package_resources_target_name) {
-    forward_variables_from(invoker, [ "extensions_to_not_compress" ])
+    forward_variables_from(invoker,
+                           [
+                             "android_aapt_path",
+                             "extensions_to_not_compress",
+                           ])
     deps =
         _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,
                            [
@@ skipping 715 matching lines @@
       sources += invoker.generated_resource_files
     }
 
     inputs = [
       build_config,
       android_manifest,
     ]
 
     _rebased_all_resource_dirs = rebase_path(_all_resource_dirs, root_build_dir)
     rebase_build_config = rebase_path(build_config, root_build_dir)
+
+    if (defined(invoker.android_aapt_path)) {
+      _android_aapt_path = invoker.android_aapt_path
+    } else {
+      _android_aapt_path = android_default_aapt_path
+    }
+
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--android-sdk",
       rebase_path(android_sdk, root_build_dir),
       "--aapt-path",
-      android_aapt_path,
+      _android_aapt_path,
       "--android-manifest",
       rebase_path(android_manifest, root_build_dir),
       "--resource-dirs=$_rebased_all_resource_dirs",
       "--srcjar-out",
       rebase_path(srcjar_path, root_build_dir),
       "--resource-zip-out",
       rebase_path(zip_path, root_build_dir),
       "--r-text-out",
       rebase_path(r_text_path, root_build_dir),
       "--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
@@ skipping 13 matching lines @@
     }
 
     if (defined(invoker.v14_skip) && invoker.v14_skip) {
       args += [ "--v14-skip" ]
     }
 
     if (defined(invoker.shared_resources) && invoker.shared_resources) {
       args += [ "--shared-resources" ]
     }
 
+    if (defined(invoker.app_as_shared_lib) && invoker.app_as_shared_lib) {
+      args += [ "--app-as-shared-lib" ]
+    }
+
     if (defined(invoker.include_all_resources) &&
         invoker.include_all_resources) {
       args += [ "--include-all-resources" ]
     }
 
     if (defined(invoker.all_resources_zip_path)) {
       all_resources_zip = invoker.all_resources_zip_path
       outputs += [ all_resources_zip ]
       args += [
         "--all-resources-zip-out",
@@ skipping 229 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }