Use _target_name instead of package_name for java*.gypi

android_webview/android_webview_tests.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.
 {
   'targets': [
     {
       'target_name': 'android_webview_test_apk',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
         '../content/content.gyp:content_java_test_support',
         '../net/net.gyp:net_java_test_support',
        'android_webview_java',
         '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',
           ],
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_unittests',
@@ skipping 21 matching lines @@
     },
     {
       'target_name': 'android_webview_unittest_java',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
         '../content/content.gyp:content_java_test_support',
         'android_webview_java',
       ],
       'variables': {
-        'package_name': 'android_webview_unittest_java',
         'java_in_dir': '../android_webview/unittestjava',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_unittests_jni',
       'type': 'none',
       'sources': [
           '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
       ],
@@ skipping 11 matching lines @@
         'android_webview_unittests_jni',
       ],
       'variables': {
         'test_suite_name': 'android_webview_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)',
       },
       'includes': [ '../build/apk_test.gypi' ],
     },
   ],
 }