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

28 files changed, 61 insertions, 111 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index bf8912e..a7f0d15 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -65,7 +65,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_pak
 LOCAL_MODULE_STEM := webviewchromium
-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak
+LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index f58bc8d..4f199f1 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -64,11 +64,11 @@
             '<@(pak_inputs)',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/android_webview/assets/webviewchromium.pak',
+            '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
           ],
           'action': ['python', '<(repack_path)', '<@(_outputs)',
                      '<@(pak_inputs)'],
-      },
+        }
       ],
     },
     {
@@ -180,7 +180,6 @@
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
-        'package_name': 'android_webview_java',
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
@@ -199,11 +198,13 @@
         'libwebviewchromium',
       ],
       'variables': {
-        'package_name': 'android_webview',
         'apk_name': 'AndroidWebView',
         'manifest_package_name': 'org.chromium.android_webview',
         'java_in_dir': '../android_webview/java',
         'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'],
+        'additional_input_paths': [
+          '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
+        ],
       },
       'includes': [ '../build/java_apk.gypi' ],
     },
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 0ca95ca..6110b86 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -14,15 +14,18 @@
         'libwebviewchromium',
       ],
       'variables': {
-        'package_name': 'android_webview_test',
         'apk_name': 'AndroidWebViewTest',
         'java_in_dir': '../android_webview/javatests',
         'resource_dir': 'res',
         'is_test_apk': 1,
+        'additional_input_paths': [
+          '<(PRODUCT_DIR)/android_webview_test_apk/assets/asset_file.html',
+          '<(PRODUCT_DIR)/android_webview_test_apk/assets/asset_icon.png',
+        ],
       },
       'copies': [
         {
-          'destination': '<(PRODUCT_DIR)/android_webview_test/assets',
+          'destination': '<(PRODUCT_DIR)/android_webview_test_apk/assets',
           'files': [
             '<(java_in_dir)/assets/asset_file.html',
             '<(java_in_dir)/assets/asset_icon.png',
@@ -64,7 +67,6 @@
         'android_webview_java',
       ],
       'variables': {
-        'package_name': 'android_webview_unittest_java',
         'java_in_dir': '../android_webview/unittestjava',
       },
       'includes': [ '../build/java.gypi' ],
diff --git a/base/base.gyp b/base/base.gyp
index c114875..2c1ecc7 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1113,7 +1113,6 @@
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
-            'package_name': 'base',
             'java_in_dir': '../base/android/java',
           },
           'includes': [ '../build/java.gypi' ],
@@ -1125,7 +1124,6 @@
             'base_java',
           ],
           'variables': {
-            'package_name': 'base_javatests',
             'java_in_dir': '../base/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml
index 72c2047..4b059b5 100644
--- a/build/android/ant/chromium-apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -20,11 +20,7 @@
   </description>
   <import file="common.xml"/>
 
-  <property-location
-      name="out.dir"
-      location="${PRODUCT_DIR}/${PACKAGE_NAME}"
-      check-exists="false"
-  />
+  <property-location name="out.dir" location="${OUT_DIR}" check-exists="false" />
 
   <path id="javac.srcdirs.additional">
     <filelist files="${ADDITIONAL_SRC_DIRS}"/>
diff --git a/build/android/ant/chromium-jars.xml b/build/android/ant/chromium-jars.xml
index 8f5eaa0..db44ee3 100644
--- a/build/android/ant/chromium-jars.xml
+++ b/build/android/ant/chromium-jars.xml
@@ -5,11 +5,7 @@
 -->
 <project name="chromium-jars" default="dist">
   <!--
-    Common ant build file for for chromium_*.jars.
-    For creating a new chromium_*.jar :
-    1. Use build/java.gypi action.
-    The jar will be created as chromium_${PACKAGE_NAME} in
-    ${PRODUCT_DIR}/lib.java.
+    Common ant build file for Java libraries. For building new libraries, see build/java.gypi.
   -->
   <description>
     Building ${PROJECT_NAME}/ java source code with ant.
@@ -32,31 +28,27 @@
     value="src:${toString:javac.srcdirs.additional}"
   />
 
-  <property-location
-    name="dest.dir"
-    location="${PRODUCT_DIR}/java/${PACKAGE_NAME}"
-    check-exists="false"
-  />
+  <property-location name="out.dir" location="${OUT_DIR}" check-exists="false" />
 
-    <condition property="javac_includes_message"
-               value=""
-               else="Include filter: ${JAVAC_INCLUDES}">
-        <equals arg1="${JAVAC_INCLUDES}" arg2=""/>
-    </condition>
+  <condition property="javac_includes_message"
+             value=""
+             else="Include filter: ${JAVAC_INCLUDES}">
+    <equals arg1="${JAVAC_INCLUDES}" arg2=""/>
+  </condition>
 
   <target name="init">
     <!-- Create the time stamp -->
     <tstamp/>
     <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${dest.dir}"/>
+    <mkdir dir="${out.dir}"/>
 
-    <!-- Remove all .class files from dest.dir. This prevents inclusion of
+    <!-- Remove all .class files from out.dir. This prevents inclusion of
          incorrect .class files in the final .jar. For example, if a .java file
          was deleted, the .jar should not contain the .class files for that
          .java from previous builds.
     -->
     <delete>
-      <fileset dir="${dest.dir}" includes="**/*.class"/>
+      <fileset dir="${out.dir}" includes="**/*.class"/>
     </delete>
   </target>
 
@@ -70,7 +62,7 @@
 
     <javac
         srcdir="${javac.srcdir}"
-        destdir="${dest.dir}"
+        destdir="${out.dir}"
         classpathref="javac.custom.classpath"
         debug="true"
         includeantruntime="false"
@@ -80,25 +72,25 @@
   </target>
 
   <target name="dist" depends="compile"
-      description="Generate chromium_${PACKAGE_NAME}.jar.">
+      description="Generate ${JAR_NAME}.">
     <!-- Create the distribution directory.  We exclude R.class and R$*.class
          files since new versions of these files with the correct resource -> ID
          mapping will be provided when we build each individual apk. -->
     <jar
-      jarfile="${lib.java.dir}/chromium_${PACKAGE_NAME}.jar"
+      jarfile="${lib.java.dir}/${JAR_NAME}"
       excludes="**/R.class **/R$*.class"
-      basedir="${dest.dir}"
+      basedir="${out.dir}"
     />
 
     <!-- If Gyp thinks this output is stale but Ant doesn't, the modification
          time should still be updated. Otherwise, this target will continue to
          be rebuilt in future builds.
     -->
-    <touch file="${lib.java.dir}/chromium_${PACKAGE_NAME}.jar"/>
+    <touch file="${lib.java.dir}/${JAR_NAME}"/>
   </target>
 
   <target name="clean" description="clean up">
     <!-- Delete the appropriate directory trees -->
-    <delete dir="${dest.dir}"/>
+    <delete dir="${out.dir}"/>
   </target>
 </project>
diff --git a/build/java.gypi b/build/java.gypi
index bd3976c..9c96a0f 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -10,17 +10,12 @@
 #   '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
 # 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:
@@ -51,17 +46,12 @@
   'dependencies': [
     '<(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.
-  'all_dependent_settings': {
-    'variables': {
-      'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'],
-    },
-  },
   'variables': {
     'input_jars_paths': [],
     'additional_src_dirs': [],
     'javac_includes': [],
+    'jar_name': '<(_target_name).jar',
+    'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'additional_input_paths': ['>@(additional_R_files)'],
     'generated_src_dirs': ['>@(generated_R_dirs)'],
     'generated_R_dirs': [],
@@ -69,12 +59,19 @@
     'has_java_resources%': 0,
     'java_strings_grd%': '',
   },
+  # This all_dependent_settings is used for java targets only. This will add the
+  # jar path to the classpath of dependent java targets.
+  'all_dependent_settings': {
+    'variables': {
+      'input_jars_paths': ['<(jar_path)'],
+    },
+  },
   'conditions': [
     ['has_java_resources == 1', {
       'variables': {
         'res_dir': '<(java_in_dir)/res',
-        'out_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res',
-        'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/java_R',
+        'out_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/res',
+        'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/java_R',
         'R_file': '<(R_dir)/<(R_package_relpath)/R.java',
         'R_text_file': '<(R_dir)/R.txt',
         'generated_src_dirs': ['<(R_dir)'],
@@ -115,7 +112,7 @@
         # Generate R.java and crunch image resources.
         {
           'action_name': 'process_resources',
-          'message': 'processing resources for <(package_name)',
+          'message': 'processing resources for <(_target_name)',
           'conditions': [
             ['java_strings_grd != ""', {
               'inputs': [
@@ -148,8 +145,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',
@@ -158,7 +155,7 @@
         '>@(additional_input_paths)',
       ],
       'outputs': [
-        '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',
+        '<(jar_path)',
       ],
       'action': [
         'ant', '-quiet',
@@ -173,7 +170,8 @@
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
-        '-DPACKAGE_NAME=<(package_name)',
+        '-DJAR_NAME=<(jar_name)',
+        '-DOUT_DIR=<(ant_build_out)/<(_target_name)',
         '-DJAVAC_INCLUDES=>(javac_includes)',
 
         '-Dbasedir=<(java_in_dir)',
diff --git a/build/java_aidl.gypi b/build/java_aidl.gypi
index bb8f2b8..2d4ae2e 100644
--- a/build/java_aidl.gypi
+++ b/build/java_aidl.gypi
@@ -10,7 +10,6 @@
 #   'target_name': 'aidl_aidl-file-name',
 #   'type': 'none',
 #   'variables': {
-#     'package_name': <name-of-package>
 #     'aidl_interface_file': '<interface-path>/<interface-file>.aidl',
 #     'aidl_import_include': '<(DEPTH)/<path-to-src-dir>',
 #   },
@@ -35,16 +34,17 @@
 # TODO(cjhopman): dependents need to rebuild when this target's inputs have changed.
 
 {
-  'direct_dependent_settings': {
-    'variables': {
-      'generated_src_dirs': ['<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/'],
-    },
-  },
   'variables': {
+    'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/aidl',
     'aidl_import_include%': '',
     'additional_aidl_arguments': [],
     'additional_aidl_input_paths': [],
   },
+  'direct_dependent_settings': {
+    'variables': {
+      'generated_src_dirs': ['<(intermediate_dir)/'],
+    },
+  },
   'conditions': [
     ['"<(aidl_import_include)"!=""', {
       'variables': {
@@ -63,7 +63,7 @@
         '<@(additional_aidl_input_paths)',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
       'action': [
         '<(android_sdk_tools)/aidl',
@@ -71,7 +71,7 @@
         '-p<(aidl_interface_file)',
         '<@(additional_aidl_arguments)',
         '<(RULE_INPUT_PATH)',
-        '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/aidl/<(RULE_INPUT_ROOT).java',
+        '<(intermediate_dir)/<(RULE_INPUT_ROOT).java',
       ],
     },
   ],
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)',
diff --git a/build/protoc_java.gypi b/build/protoc_java.gypi
index 4465c10..a99ec6a 100644
--- a/build/protoc_java.gypi
+++ b/build/protoc_java.gypi
@@ -45,7 +45,6 @@
     'script': '<(DEPTH)/build/protoc_java.py',
 
     # The rest of the variables here are for the java.gypi include.
-    'package_name': '<(_target_name)',
     'java_in_dir': '<(DEPTH)/build/android/empty',
     'generated_src_dirs': ['<(java_out_dir)'],
     # Adding the |stamp_file| to |additional_input_paths| makes the actions in
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 78bbed7..ab52f58 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1087,7 +1087,6 @@
             '../ui/ui.gyp:ui_java',
           ],
           'variables': {
-            'package_name': 'chrome',
             'java_in_dir': '../chrome/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.chrome',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d974582..2591f88 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3063,7 +3063,6 @@
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'variables': {
-            'package_name': 'chromium_testshell_test',
             'apk_name': 'ChromiumTestShellTest',
             'java_in_dir': './android/testshell/javatests',
             'resource_dir': '../res',
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 24a5837..3e14df7 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -56,7 +56,6 @@
                 '../base/base.gyp:base',
               ],
               'variables': {
-                'package_name': 'navigation_interception',
                 'java_in_dir': 'navigation_interception/android/java',
               },
               'includes': [ '../build/java.gypi' ],
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
index 00a55e0..179b1a6 100644
--- a/components/web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android.gypi
@@ -42,7 +42,6 @@
             '../content/content.gyp:content_java',
           ],
           'variables': {
-            'package_name': 'web_contents_delegate_android',
             'java_in_dir': 'web_contents_delegate_android/android/java',
           },
           'includes': [ '../build/java.gypi' ],
diff --git a/content/content.gyp b/content/content.gyp
index 26f1b03..762379d 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -293,7 +293,6 @@
           'target_name': 'common_aidl',
           'type': 'none',
           'variables': {
-            'package_name': 'content',
             'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl',
           },
           'sources': [
@@ -315,7 +314,6 @@
             'page_transition_types_java',
           ],
           'variables': {
-            'package_name': 'content',
             'java_in_dir': '../content/public/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.content',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 12eb178..5877dca 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -607,7 +607,6 @@
             'content_java',
           ],
           'variables': {
-            'package_name': 'content_shell',
             'java_in_dir': '../content/shell/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.content_shell',
@@ -658,7 +657,6 @@
             '../ui/ui.gyp:ui_java',
           ],
           'variables': {
-            'package_name': 'content_shell_apk',
             'apk_name': 'ContentShell',
             'manifest_package_name': 'org.chromium.content_shell_apk',
             'java_in_dir': 'shell/android/shell_apk',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ad4fb7b..bd315c4 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -991,7 +991,6 @@
             'content_shell_java',
           ],
           'variables': {
-            'package_name': 'content_browsertests_apk',
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'res',
@@ -1015,7 +1014,6 @@
             'content_java',
           ],
           'variables': {
-            'package_name': 'content_java_test_support',
             'java_in_dir': '../content/public/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
@@ -1036,7 +1034,6 @@
             '../tools/android/forwarder2/forwarder.gyp:forwarder2',
           ],
           'variables': {
-            'package_name': 'content_shell_test',
             'apk_name': 'ContentShellTest',
             'java_in_dir': '../content/shell/android/javatests',
             'additional_src_dirs': ['../content/public/android/javatests/',],
diff --git a/media/media.gyp b/media/media.gyp
index 65ccc85..7485411 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1385,7 +1385,6 @@
             '../base/base.gyp:base',
           ],
           'variables': {
-            'package_name': 'media',
             'java_in_dir': 'base/android/java',
           },
           'includes': [ '../build/java.gypi' ],
diff --git a/net/net.gyp b/net/net.gyp
index c890806..5671370 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2390,7 +2390,6 @@
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
-            'package_name': 'net',
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
@@ -2406,7 +2405,6 @@
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
-            'package_name': 'net_java_test_support',
             'java_in_dir': '../net/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
@@ -2415,7 +2413,6 @@
           'target_name': 'net_javatests',
           'type': 'none',
           'variables': {
-            'package_name': 'net_javatests',
             'java_in_dir': '../net/android/javatests',
           },
           'dependencies': [
diff --git a/sync/sync_android.gypi b/sync/sync_android.gypi
index 168959a..1964fbd 100644
--- a/sync/sync_android.gypi
+++ b/sync/sync_android.gypi
@@ -10,7 +10,6 @@
           'target_name': 'sync_java',
           'type': 'none',
           'variables': {
-            'package_name': 'sync',
             'java_in_dir': '../sync/android/java',
           },
           'dependencies': [
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index dfef680..8b399da 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -568,7 +568,6 @@
           'target_name': 'sync_javatests',
           'type': 'none',
           'variables': {
-            'package_name': 'sync_javatests',
             'java_in_dir': '../sync/android/javatests',
           },
           'dependencies': [
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index d783dcb..1fcb28a 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -207,7 +207,6 @@
             'cacheinvalidation_proto_java',
           ],
           'variables': {
-            'package_name': '<(_target_name)',
             'java_in_dir': '../../build/android/empty',
             'additional_src_dirs': [ 'src/java/' ],
           },
@@ -217,7 +216,6 @@
           'target_name': 'cacheinvalidation_aidl_javalib',
           'type': 'none',
           'variables': {
-            'package_name': '<(_target_name)',
             # TODO(shashishekhar): aidl_interface_file should be made optional.
             'aidl_interface_file':'<(android_sdk)/framework.aidl'
           },
diff --git a/third_party/eyesfree/eyesfree.gyp b/third_party/eyesfree/eyesfree.gyp
index a9b2853..6a8501e 100644
--- a/third_party/eyesfree/eyesfree.gyp
+++ b/third_party/eyesfree/eyesfree.gyp
@@ -12,7 +12,6 @@
             'eyesfree_aidl',
           ],
           'variables': {
-            'package_name': 'eyesfree',
             'java_in_dir': 'src/android/java',
           },
           'includes': [ '../../build/java.gypi' ],
@@ -21,7 +20,6 @@
           'target_name': 'eyesfree_aidl',
           'type': 'none',
           'variables': {
-            'package_name': 'eyesfree',
             'aidl_interface_file': '<(android_sdk)/framework.aidl',
             'aidl_import_include': 'src/android/java/src',
           },
diff --git a/third_party/guava/guava.gyp b/third_party/guava/guava.gyp
index 2a0b983..bfe2a30 100644
--- a/third_party/guava/guava.gyp
+++ b/third_party/guava/guava.gyp
@@ -8,7 +8,6 @@
       'target_name': 'guava_javalib',
       'type': 'none',
       'variables': {
-        'package_name': '<(_target_name)',
         'java_in_dir': 'src/guava',
       },
       'dependencies': [
diff --git a/third_party/jsr-305/jsr-305.gyp b/third_party/jsr-305/jsr-305.gyp
index a51eded..37af4b2 100644
--- a/third_party/jsr-305/jsr-305.gyp
+++ b/third_party/jsr-305/jsr-305.gyp
@@ -8,7 +8,6 @@
       'target_name': 'jsr_305_javalib',
       'type': 'none',
       'variables': {
-        'package_name': '<(_target_name)',
         # The sources are not located in a folder that is called src/, so we
         # need to set it in additional_src_dirs parameter instead.
         'java_in_dir': '../../build/android/empty',
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 7c507c1..772bc10 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -83,7 +83,6 @@
                 # Variables needed by java.gypi below.
                 'java_out_dir': '<(PRODUCT_DIR)/java_proto/protobuf_lite_java_descriptor_proto',
                 'generated_src_dirs': ['<(java_out_dir)'],
-                'package_name': '<(_target_name)',
                 'java_in_dir': 'java',
                 'maven_pom': '<(java_in_dir)/pom.xml',
                 'javac_includes': ['<!@(<(script_pom) <(maven_pom))'],
diff --git a/tools/android/findbugs_plugin/findbugs_plugin.gyp b/tools/android/findbugs_plugin/findbugs_plugin.gyp
index c966e76..16d06e6 100644
--- a/tools/android/findbugs_plugin/findbugs_plugin.gyp
+++ b/tools/android/findbugs_plugin/findbugs_plugin.gyp
@@ -8,7 +8,6 @@
          'target_name': 'findbugs_plugin_test',
          'type': 'none',
          'variables': {
-           'package_name': 'findbugs_plugin',
            'java_in_dir': 'test/java/',
          },
          'includes': [ '../../../build/java.gypi' ],
diff --git a/ui/ui.gyp b/ui/ui.gyp
index ce90681..f82fa4d 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -872,7 +872,6 @@
            'target_name': 'ui_java',
            'type': 'none',
            'variables': {
-             'package_name': 'ui',
              'java_in_dir': '../ui/android/java',
              'has_java_resources': 1,
              'R_package': 'org.chromium.ui',