[Android] Rename package_name in java_cpp_template to package_path.

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 336 matching lines @@
   # android_library target's srcjar_deps will make the generated java files be
   # included in that library's final outputs.
   #
   # Variables
   #   sources: list of files to be processed by the C pre-processor. For each
   #     file in sources, there will be one .java file in the final .srcjar. For a
   #     file named FooBar.template, a java file will be created with name
   #     FooBar.java.
   #   inputs: additional compile-time dependencies. Any files
   #     `#include`-ed in the templates should be listed here.
-  #   package_name: this will be the subdirectory for each .java file in the
+  #   package_path: this will be the subdirectory for each .java file in the
   #     .srcjar.
   #
   # Example
   #   java_cpp_template("foo_generated_enum") {
   #     sources = [
   #       "android/java/templates/Foo.template",
   #     ]
   #     inputs = [
   #       "android/java/templates/native_foo_header.h",
   #     ]
   #
-  #     package_name = "org/chromium/base/library_loader"
+  #     package_path = "org/chromium/base/library_loader"
   #     include_path = "android/java/templates"
   #   }
   template("java_cpp_template") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     _include_path = "//"
     if (defined(invoker.include_path)) {
       _include_path = invoker.include_path
     }
 
     _apply_gcc_target_name = "${target_name}__apply_gcc"
     _base_gen_dir = "${target_gen_dir}/${target_name}/java_cpp_template"
 
+    if (defined(invoker.package_path)) {
+      package_path = invoker.package_path
+    } else {
+      # TODO(jbudorick): Back this out once all clients have been switched to
+      # package_path.
+      assert(defined(invoker.package_name))
+      package_path = invoker.package_name
+    }
+
     action_foreach(_apply_gcc_target_name) {
       forward_variables_from(invoker,
                              [
                                "deps",
                                "public_deps",
                                "data_deps",
                              ])
       script = "//build/android/gyp/gcc_preprocess.py"
       if (defined(invoker.inputs)) {
         inputs = invoker.inputs + []
       }
       depfile =
           "${target_gen_dir}/${invoker.target_name}_{{source_name_part}}.d"
 
       sources = invoker.sources
 
       outputs = [
-        "$_base_gen_dir/${invoker.package_name}/{{source_name_part}}.java",
+        "$_base_gen_dir/${package_path}/{{source_name_part}}.java",
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--include-path",
         rebase_path(_include_path, root_build_dir),
         "--output",
         rebase_path(outputs[0], root_build_dir),
         "--template={{source}}",
@@ skipping 1391 matching lines @@
         _rebased_android_readelf = rebase_path(android_readelf, root_build_dir)
         args = [
           "--readelf=$_rebased_android_readelf",
           "--output=$_rebased_ordered_libraries_json",
           "--libraries-dir=.",
           "--input-libraries=@FileArg($_rebased_build_config:native:libraries)",
         ]
       }
 
       java_cpp_template("${_template_name}__native_libraries_java") {
-        package_name = "org/chromium/base/library_loader"
+        package_path = "org/chromium/base/library_loader"
         sources = [
           "//base/android/java/templates/NativeLibraries.template",
         ]
         inputs = [
           _ordered_libraries_json,
         ]
         deps = [
           ":${_ordered_libraries_target}",
         ]
         if (_native_lib_version_rule != "") {
@@ skipping 13 matching lines @@
         }
         if (_enable_chromium_linker_tests) {
           defines += [ "ENABLE_CHROMIUM_LINKER_TESTS" ]
         }
       }
       _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
     }
 
     if (_generate_buildconfig_java) {
       java_cpp_template("${_template_name}__build_config_java") {
-        package_name = "org/chromium/base"
+        package_path = "org/chromium/base"
         sources = [
           "//base/android/java/templates/BuildConfig.template",
         ]
         deps = [
           ":$build_config_target",
         ]
 
         defines = []
         if (enable_multidex) {
           defines += [ "ENABLE_MULTIDEX" ]
@@ skipping 1035 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }