Use _target_name instead of package_name for java*.gypi

build/java.gypi

Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 56af2e1175f9085102b7c5cf92c12d707c513352..44409d3b65b558b3688384236b164307c3c65043 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -10,17 +10,14 @@
 #   'target_name': 'my-package_java',
 #   'type': 'none',
 #   'variables': {
-#     'package_name': 'my-package',
 #     'java_in_dir': 'path/to/package/root',
 #   },
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
 # The generated jar-file will be:
-#   <(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar
+#   <(PRODUCT_DIR)/lib.java/chromium_<(_target_name).jar

[Yaron, 2012/11/08 02:43:11]

I didn't know _target_name existed!

 # Required variables:
-#  package_name - Used to name the intermediate output directory and in the
-#    names of some output files.
 #  java_in_dir - The top-level java directory. The src should be in
 #    <java_in_dir>/src.
 # Optional/automatic variables:
@@ -40,10 +37,10 @@
     '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
   ],
   # This all_dependent_settings is used for java targets only. This will add the
-  # chromium_<(package_name) jar to the classpath of dependent java targets.
+  # chromium_<(_target_name) jar to the classpath of dependent java targets.
   'all_dependent_settings': {
     'variables': {
-      'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'],
+      'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(_target_name).jar'],
     },
   },
   'variables': {
@@ -54,8 +51,8 @@
   },
   'actions': [
     {
-      'action_name': 'ant_<(package_name)',
-      'message': 'Building <(package_name) java sources.',
+      'action_name': 'ant_<(_target_name)',
+      'message': 'Building <(_target_name) java sources.',
       'inputs': [
         'android/ant/common.xml',
         'android/ant/chromium-jars.xml',
@@ -64,7 +61,7 @@
         '>@(additional_input_paths)',
       ],
       'outputs': [
-        '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',
+        '<(PRODUCT_DIR)/lib.java/chromium_<(_target_name).jar',
       ],
       'action': [
         'ant',
@@ -79,7 +76,9 @@
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
-        '-DPACKAGE_NAME=<(package_name)',
+        '-DJAR_NAME=chromium_<(_target_name).jar',

[Yaron, 2012/11/08 02:43:11]

Why do we have the "chromium_" prefix? What could we be colliding with?

[cjhopman, 2012/12/05 00:51:04]

I've removed the prefix, there's nothing that we should be colliding with. This
change already changes the name for all the jars, so changing it more by
removing the prefix should be fine.

+        '-DOUT_DIR=<(PRODUCT_DIR)/<(_target_name)',

[Yaron, 2012/11/08 02:43:11]

OUT_DIR doesn't appear to be used by chromium-jars.xml. Although you could set
dest.dir to it and be more consistent with apks.

[cjhopman, 2012/12/05 00:51:04]

Done. To be consistent with chromium-apks.xml and java_apk.gypi I've changed
dest.dir to out.dir in chromium-jars.xml.

+        '-DTARGET_NAME=<(_target_name)',
 
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',