Use _target_name instead of package_name for java*.gypi

content/content_shell.gypi

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 589 matching lines @@
             }],
           ],
         },
         {
           'target_name': 'content_shell_java',
           'type': 'none',
           'dependencies': [
             'content_java',
           ],
           'variables': {
-            'package_name': 'content_shell',
             'java_in_dir': '../content/shell/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.content_shell',
             'R_package_relpath': 'org/chromium/content_shell',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # content_shell_apk creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
@@ skipping 30 matching lines @@
           'dependencies': [
             'content_java',
             'content_shell_java',
             'libcontent_shell_content_view',
             '../base/base.gyp:base_java',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
             '../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',
             'resource_dir': 'res',
             'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }