Use _target_name instead of package_name for java*.gypi

android_webview/android_webview.gyp

 # Copyright (c) 2009 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': {
     'chromium_code': 1,
   },
   'includes': [
     'android_webview_tests.gypi',
   ],
@@ skipping 46 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],
           },
           'inputs': [
             '<(repack_path)',
             '<@(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)'],
       },
       {
           # TODO(benm): remove this when we can get our strings from the
           # java framework.
           'action_name': 'repack_android_webview__strings_pack',
           'dependencies': [
             '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
           ],
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
             ],
           },
           'inputs': [
             '<(repack_path)',
             '<@(pak_inputs)',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/android_webview/assets/webviewchromium_strings.pak',
+            '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium_strings.pak',
           ],
           'action': ['python', '<(repack_path)', '<@(_outputs)',
                      '<@(pak_inputs)'],
       }],
     },
     {
       'target_name': 'android_webview_common',
       'type': 'static_library',
       'dependencies': [
         '../android_webview/native/webview_native.gyp:webview_native',
@@ skipping 94 matching lines @@
     {
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
         '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
-        'package_name': 'android_webview_java',
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java',
         '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
         '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',
+          '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium_strings.pak',
+        ],
       },
       'includes': [ '../build/java_apk.gypi' ],
     },
   ],
 }