Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1236)

Unified Diff: content/content.gyp

Issue 834133004: Don't initialize C++ constants in Java during JNI registration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: multi-line package name yet again Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/ime_adapter_android.cc ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 0e91372c6e09f245afa98b83328051284e23edba..55a76b110ef16d1524cc789456bfd633e229548c 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -436,11 +436,13 @@
'../net/net.gyp:net',
'../ui/android/ui_android.gyp:ui_java',
'../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
+ '../third_party/WebKit/public/blink_headers.gyp:blink_headers_java',
'common_aidl',
'content_common',
'content_strings_grd',
'content_gamepad_mapping',
'gesture_event_type_java',
+ 'navigation_controller_java',
'popup_item_type_java',
'result_codes_java',
'speech_recognition_error_java',
@@ -484,6 +486,14 @@
'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
{
+ 'target_name': 'navigation_controller_java',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'public/browser/navigation_controller.h',
+ },
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ },
+ {
'target_name': 'popup_item_type_java',
'type': 'none',
'variables': {
« no previous file with comments | « content/browser/renderer_host/ime_adapter_android.cc ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698