Use _target_name instead of package_name for java*.gypi

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 1777b441f1a01336a822d18e687f6ed982fe4ebd..90045026d3df1afa4dc9203d4fac121beb27f28d 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -10,7 +10,6 @@
 #   'target_name': 'my_package_apk',
 #   'type': 'none',
 #   'variables': {
-#     'package_name': 'my_package',
 #     'apk_name': 'MyPackage',
 #     'java_in_dir': 'path/to/package/root',
 #     'resource_dir': 'res',
@@ -18,18 +17,7 @@
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
-# Note that this assumes that there's an ant buildfile <package_name>_apk.xml in
-# java_in_dir. So, if you have package_name="content_shell" and
-# java_in_dir="content/shell/android/java" you should have a directory structure
-# like:
-#
-# content/shell/android/java/content_shell_apk.xml
-# content/shell/android/java/src/chromium/base/Foo.java
-# content/shell/android/java/src/chromium/base/Bar.java
-#
 # Required variables:
-#  package_name - Used to name the intermediate output directory and in the
-#    names of some output files.
 #  apk_name - The final apk will be named <apk_name>.apk
 #  java_in_dir - The top-level java directory. The src should be in
 #    <java_in_dir>/src.
@@ -39,7 +27,7 @@
 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
 #  asset_location - The directory where assets are located (default:
-#    <PRODUCT_DIR>/<package_name>/assets).
+#    <PRODUCT_DIR>/<(_target_name)/assets).
 #  generated_src_dirs - Same as additional_src_dirs except used for .java files
 #    that are generated at build time. This should be set automatically by a
 #    target's dependencies. The .java files in these directories are not
@@ -67,7 +55,7 @@
     'native_libs_paths': [],
     'manifest_package_name%': 'unknown.package.name',
     'resource_dir%':'',
-    'jar_name%': 'chromium_apk_<(package_name).jar',
+    'jar_name%': 'chromium_apk_<(_target_name).jar',
   },
   'sources': [
       '<@(native_libs_paths)'
@@ -85,7 +73,7 @@
       'rule_name': 'copy_and_strip_native_libraries',
       'extension': 'so',
       'variables': {
-        'stripped_library_path': '<(PRODUCT_DIR)/<(package_name)/libs/<(android_app_abi)/<(RULE_INPUT_ROOT).so',
+        'stripped_library_path': '<(PRODUCT_DIR)/<(_target_name)/libs/<(android_app_abi)/<(RULE_INPUT_ROOT).so',
         'link_dir': '<(android_product_out)/symbols/data/data/<(manifest_package_name)/lib/',
       },
       'outputs': [
@@ -106,8 +94,8 @@
   ],
   'actions': [
     {
-      'action_name': 'ant_<(package_name)_apk',
-      'message': 'Building <(package_name) apk.',
+      'action_name': 'ant_<(_target_name)',
+      'message': 'Building <(_target_name).',
       'inputs': [
         '<(java_in_dir)/AndroidManifest.xml',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
@@ -147,7 +135,7 @@
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DJAR_NAME=<(jar_name)',
-        '-DPACKAGE_NAME=<(package_name)',
+        '-DOUT_DIR=<(PRODUCT_DIR)/<(_target_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',