refactoring Android Webview JNI_OnLoad interface

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 39ae4acabd56f231952140fcbe775de329d833cb..7e329383f3517c97e1c2fa55e2f0d0916df1ed6e 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -349,9 +349,60 @@
       ],
     },
     {
+      'target_name': 'android_webview',

[Torne, 2015/03/05 18:56:09]

This target is unnecessary - it is exactly the same thing as
android_webview_common.

android_webview_build==1 is only defined downstream in Android and isn't
relevant to any work going forward; as far as anyone in chromium needs to be
concerned now, this condition is always false and I intend to permanently remove
them all from the sources soon.

[michaelbai, 2015/03/05 19:28:52]

Sounds good, I reverted this part

+      'type': 'none',
+      'dependencies': [
+        'android_webview_common',
+      ],
+      'conditions': [
+        ['android_webview_build==1', {
+          'dependencies': [
+            # When building inside the android tree we also need to depend on
+            # all the java sources generated from templates which will be
+            # needed by android_webview_java in
+            # android_webview/java_library_common.mk.
+            '../base/base.gyp:base_java_application_state',
+            '../base/base.gyp:base_java_library_load_from_apk_status_codes',
+            '../base/base.gyp:base_java_library_process_type',
+            '../base/base.gyp:base_java_memory_pressure_level',
+            '../content/content.gyp:console_message_level_java',
+            '../content/content.gyp:content_gamepad_mapping',
+            '../content/content.gyp:gesture_event_type_java',
+            '../content/content.gyp:invalidate_types_java',
+            '../content/content.gyp:navigation_controller_java',
+            '../content/content.gyp:popup_item_type_java',
+            '../content/content.gyp:result_codes_java',
+            '../content/content.gyp:screen_orientation_values_java',
+            '../content/content.gyp:speech_recognition_error_java',
+            '../content/content.gyp:top_controls_state_java',
+            '../media/media.gyp:media_android_imageformat',
+            '../net/net.gyp:cert_verify_status_android_java',
+            '../net/net.gyp:certificate_mime_types_java',
+            '../net/net.gyp:network_change_notifier_types_java',
+            '../net/net.gyp:net_errors_java',
+            '../net/net.gyp:private_key_types_java',
+            '../third_party/WebKit/public/blink_headers.gyp:web_input_event_java',
+            '../third_party/WebKit/public/blink_headers.gyp:web_text_input_type',
+            '../ui/android/ui_android.gyp:android_resource_type_java',
+            '../ui/android/ui_android.gyp:bitmap_format_java',
+            '../ui/android/ui_android.gyp:page_transition_types_java',
+            '../ui/android/ui_android.gyp:system_ui_resource_type_java',
+            '../ui/android/ui_android.gyp:touch_device_types_java',
+            '../ui/android/ui_android.gyp:window_open_disposition_java',
+            '../ui/android/ui_android.gyp:text_input_type_java',
+            '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
+            '../ui/touch_selection/ui_touch_selection.gyp:touch_handle_orientation_java',
+            # We also need to depend on the Java bindings generated from the
+            # .mojom files.
+            '../device/battery/battery.gyp:device_battery_mojo_bindings_for_webview',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'libwebviewchromium',
       'includes': [
-          'libwebviewchromium.gypi',
+        'libwebviewchromium.gypi',
       ],
     }
   ],