Make content_shell_apk build completely

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 11 matching lines @@
 #
 # Example
 #   generate_jni("foo_jni") {
 #     sources = [
 #       "android/java/src/org/chromium/foo/Foo.java",
 #       "android/java/src/org/chromium/foo/FooUtil.java",
 #     ]
 #     jni_package = "foo"
 #   }
 template("generate_jni") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.sources))
   assert(defined(invoker.jni_package))
   jni_package = invoker.jni_package
   base_output_dir = "${root_gen_dir}/${target_name}/${jni_package}"
   jni_output_dir = "${base_output_dir}/jni"
 
   jni_generator_include = "//base/android/jni_generator/jni_generator_helper.h"
 
   foreach_target_name = "${target_name}__jni_gen"
   action_foreach(foreach_target_name) {
@@ skipping 56 matching lines @@
 #   deps, forward_dependent_configs_from: As normal
 #
 # Example
 #   generate_jar_jni("foo_jni") {
 #     classes = [
 #       "android/view/Foo.class",
 #     ]
 #     jni_package = "foo"
 #   }
 template("generate_jar_jni") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.classes))
   assert(defined(invoker.jni_package))
 
   if (defined(invoker.jar_file)) {
     jar_file = invoker.jar_file
   } else {
     jar_file = android_sdk_jar
   }
 
   jni_package = invoker.jni_package
@@ skipping 79 matching lines @@
 #       "android/java/templates/Foo.template",
 #     ]
 #     inputs = [
 #       "android/java/templates/native_foo_header.h",
 #     ]
 #
 #     package_name = "org/chromium/base/library_loader"
 #     include_path = "android/java/templates"
 #   }
 template("java_cpp_template") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.sources))
   package_name = invoker.package_name + ""
 
   if (defined(invoker.include_path)) {
     include_path = invoker.include_path + ""
   } else {
     include_path = "//"
   }
 
   action_foreach("${target_name}__apply_gcc") {
@@ skipping 65 matching lines @@
 # Example
 #   java_cpp_enum("foo_generated_enum") {
 #     sources = [
 #       "src/native_foo_header.h",
 #     ]
 #     outputs = [
 #       "org/chromium/FooEnum.java",
 #     ]
 #   }
 template("java_cpp_enum") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.sources))
   assert(defined(invoker.outputs))
 
   action("${target_name}__generate_enum") {
     sources = rebase_path(invoker.sources, root_build_dir)
     script = "//build/android/gyp/java_cpp_enum.py"
     gen_dir = "${target_gen_dir}/${target_name}/enums"
     outputs = get_path_info(
         rebase_path(invoker.outputs, ".", gen_dir), "abspath")
 
@@ skipping 47 matching lines @@
 #     build/android/gyp/generate_v14_compatible_resources.py). Defaults to
 #     false.
 #
 # Example
 #   android_resources("foo_resources") {
 #     deps = [":foo_strings_grd"]
 #     resource_dirs = ["res"]
 #     custom_package = "org.chromium.foo"
 #   }
 template("android_resources") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.resource_dirs))
   assert(defined(invoker.android_manifest) || defined(invoker.custom_package))
 
   base_path = "$target_gen_dir/$target_name"
   zip_path = base_path + ".resources.zip"
   srcjar_path = base_path + ".srcjar"
   build_config = base_path + ".build_config"
 
   write_build_config("${target_name}__build_config") {
     type = "android_resources"
@@ skipping 37 matching lines @@
 # Variables
 #   deps: Specifies the dependencies of this target.
 #   grd_file: Path to the .grd file to generate strings.xml from.
 #   outputs: Expected grit outputs (see grit rule).
 #
 # Example
 #  java_strings_grd("foo_strings_grd") {
 #    grd_file = "foo_strings.grd"
 #  }
 template("java_strings_grd") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   base_path = "$target_gen_dir/$target_name"
   resources_zip = base_path + ".resources.zip"
   build_config = base_path + ".build_config"
 
   write_build_config("${target_name}__build_config") {
     type = "android_resources"
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
   }
@@ skipping 66 matching lines @@
 #       ":bar_java"
 #     ]
 #     srcjar_deps = [
 #       ":foo_generated_enum"
 #     ]
 #     jar_excluded_patterns = [
 #       "*/FooService.class", "*/FooService##*.class"
 #     ]
 #   }
 template("android_library") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   _base_path = "$target_gen_dir/$target_name"
   _build_config = _base_path + ".build_config"
   _jar_path = _base_path + ".jar"
   _dex_path = _base_path + ".dex.jar"
 
   write_build_config("${target_name}__build_config") {
     type = "android_library"
 
     deps = []
@@ skipping 58 matching lines @@
 #
 # Example
 #   android_java_prebuilt("foo_java") {
 #     jar_path = "foo.jar"
 #     deps = [
 #       ":foo_resources",
 #       ":bar_java"
 #     ]
 #   }
 template("android_java_prebuilt") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.jar_path))
   _base_path = "${target_gen_dir}/$target_name"
   _jar_path = _base_path + ".jar"
   _dex_path = _base_path + ".dex.jar"
   _build_config = _base_path + ".build_config"
 
   write_build_config("${target_name}__build_config") {
     type = "android_library"
 
     deps = []
@@ skipping 72 matching lines @@
 #       ":foo_resources"
 #     ]
 #     srcjar_deps = [
 #       ":foo_generated_enum"
 #     ]
 #     native_libs = [
 #       native_lib_path
 #     ]
 #   }
 template("android_apk") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
   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"
   jar_path = "$base_path.jar"
   final_dex_path = "$gen_dir/classes.dex"
   _template_name = target_name
   _final_apk_path = ""
@@ skipping 32 matching lines @@
   _rebased_build_config = rebase_path(build_config, root_build_dir)
 
   write_build_config("${_template_name}__build_config") {
     type = "android_apk"
     dex_path = final_dex_path
     resources_zip = resources_zip_path
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
-    if (defined(invoker.testonly)) {
-      testonly = invoker.testonly
-    }
 
     native_libs = _native_libs
   }
 
   final_deps = []
 
   final_deps += [":${_template_name}__process_resources"]
   process_resources("${_template_name}__process_resources") {
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     android_manifest = invoker.android_manifest
@@ skipping 122 matching lines @@
 
     if (_native_libs != []) {
       native_libs_dir = _native_libs_dir
       deps = [":${_template_name}__prepare_native"]
     }
   }
 
   group(target_name) {
     deps = final_deps
     if (defined(invoker.datadeps)) {
-      datadeps = invoker.datadeps
+      # TODO(cjhopman): Fix this when group datadeps works.
+      deps += invoker.datadeps
     }
   }
 }
 
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
 #     the underlying android_apk invocation and should include the java and
 #     resource dependencies of the apk.
 #   unittests_dep: This should be the label of the gtest native target. This
 #     target must be defined previously in the same file.
 #   unittests_binary: The name of the binary produced by the unittests_dep
 #     target, relative to the root build directory. If unspecified, it assumes
 #     the name of the unittests_dep target (which will be correct unless that
 #     target specifies an "output_name".
 #     TODO(brettw) make this automatic by allowing get_target_outputs to
 #     support executables.
 #
 # Example
 #   unittest_apk("foo_unittests_apk") {
 #     deps = [ ":foo_java", ":foo_resources" ]
 #     unittests_dep = ":foo_unittests"
 #   }
 template("unittest_apk") {
+  testonly = true
+
   assert(defined(invoker.unittests_dep), "Need unittests_dep for $target_name")
 
   test_suite_name = get_label_info(invoker.unittests_dep, "name")
 
   if (defined(invoker.unittests_binary)) {
     unittests_binary = root_out_dir + "/" + invoker.unittests_binary
   } else {
     unittests_binary = root_out_dir + "/lib.stripped/lib" + test_suite_name + ".so"
   }
 
   android_apk(target_name) {
     _apk_name = test_suite_name
     final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
     java_files = [
       "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java"
     ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
     unittests_outputs = [ unittests_binary ]
     native_libs = [unittests_outputs[0]]
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     datadeps = [
       "//tools/android/md5sum",
     ]
-    testonly = true
   }
 }
 
 # Generate .java files from .aidl files.
 #
 # This target will store the .java files in a srcjar and should be included in
 # an android_library or android_apk's srcjar_deps.
 #
 # Variables
 #   sources: Paths to .aidl files to compile.
 #   import_include: Path to directory containing .java files imported by the
 #     .aidl files.
 #   interface_file: Preprocessed aidl file to import.
 #
 # Example
 #   android_aidl("foo_aidl") {
 #     import_include = "java/src"
 #     sources = [
 #       "java/src/com/foo/bar/FooBarService.aidl",
 #       "java/src/com/foo/bar/FooBarServiceCallback.aidl",
 #     ]
 #   }
 template("android_aidl") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
   aidl_path = "${android_sdk_build_tools}/aidl"
   framework_aidl = "$android_sdk/framework.aidl"
 
   action(target_name) {
     script = "//build/android/gyp/aidl.py"
     sources = invoker.sources
 
     imports = [ framework_aidl ]
     if (defined(invoker.interface_file)) {
@@ skipping 51 matching lines @@
 #   dist_dir: Directory for the exe and libraries. Everything in this directory
 #     will be deleted before copying in the exe and libraries.
 #   binary: Path to (stripped) executable.
 #
 # Example
 #   create_native_executable_dist("foo_dist") {
 #     dist_dir = "$root_build_dir/foo_dist"
 #     binary = "$root_build_dir/exe.stripped/foo"
 #   }
 template("create_native_executable_dist") {
+  if (defined(invoker.testonly)) { testonly = invoker.testonly }
+
   dist_dir = invoker.dist_dir
   binary = invoker.binary
   final_deps = []
   template_name = target_name
 
   libraries_list = "${target_gen_dir}/${template_name}_library_dependencies.list"
 
   # TODO(gyp)
   #'dependencies': [
   #'<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
@@ skipping 35 matching lines @@
     args = [
       "--files=$rebased_binaries_list",
       "--files=@FileArg($rebased_libraries_list:libraries)",
     ]
   }
 
   group(target_name) {
     deps = final_deps
   }
 }