Use _target_name instead of package_name for java*.gypi

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 8010ba8be7cec921f724700e0ac204634de5d87e..127587635e2a762da1849988b732ed07162a73e9 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -64,7 +64,7 @@
             '<@(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)'],
@@ -89,7 +89,7 @@
             '<@(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)'],
@@ -204,7 +204,6 @@
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
-        'package_name': 'android_webview_java',
         'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
@@ -223,11 +222,14 @@
         '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' ],
     },