Use _target_name instead of package_name for java*.gypi

We were using package_name as a unique name for naming output files and
directories. package_name was typically the same as _target_name or a
variation of it (like dropping _apk). Using _target_name instead means
we need to specify one less thing and it is (maybe?) guaranteed to be
unique.

TBR=brettw,joi,jar,fischman,zea,sky
BUG=

Review URL: https://chromiumcodereview.appspot.com/11308030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183639 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 18 deletions

diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index fb79797..76c833a 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,19 +17,10 @@
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
-# 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/src/org/chromium/base/Foo.java
-# content/shell/android/java/src/org/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.
+#    <(java_in_dir)/src.
 # Optional/automatic variables:
 #  additional_input_paths - These paths will be included in the 'inputs' list to
 #    ensure that this target is rebuilt when one of these paths changes.
@@ -39,8 +29,8 @@
 #    each directory in additional_res_dirs.
 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
-#  asset_location - The absolute path to the directory where assets are located
-#    (default: <(ant_build_out)/<(package_name)/assets).
+#  asset_location - The directory where assets are located (default:
+#    <(ant_build_out)/<(_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
@@ -70,7 +60,7 @@
     'proguard_enabled%': 'false',
     'proguard_flags%': '',
     'native_libs_paths': [],
-    'jar_name%': 'chromium_apk_<(package_name).jar',
+    'jar_name%': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'',
     'R_package%':'',
     'additional_res_dirs': [],
@@ -95,7 +85,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',
       },
       'outputs': [
         '<(stripped_library_path)',
@@ -143,8 +133,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',
@@ -201,7 +191,7 @@
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DJAR_NAME=<(jar_name)',
-        '-DPACKAGE_NAME=<(package_name)',
+        '-DOUT_DIR=<(ant_build_out)/<(_target_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
         '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
         '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',