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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content.gyp

Issue 625543002: Revert of Use the new java_cpp_enum rule in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/child/assert_matching_enums.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 388ada8c51b422875344391cec000f6f70846082..1ed85beea8866bf6cf87adba989ad5a64d662ccc 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -464,68 +464,88 @@
],
},
{
- 'target_name': 'content_gamepad_mapping',
- 'type': 'none',
- 'variables': {
- 'source_file': 'browser/gamepad/gamepad_standard_mappings.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
- },
- {
'target_name': 'gesture_event_type_java',
'type': 'none',
- 'variables': {
- 'source_file': 'browser/android/gesture_event_type.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/GestureEventType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/browser',
+ 'template_deps': ['browser/android/gesture_event_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'popup_item_type_java',
'type': 'none',
- 'variables': {
- 'source_file': 'browser/android/content_view_core_impl.cc',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/input/PopupItemType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/browser/input',
+ 'template_deps': ['browser/android/popup_item_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'result_codes_java',
'type': 'none',
- 'variables': {
- 'source_file': 'public/common/result_codes.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/common/ResultCodes.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/common',
+ 'template_deps': ['public/common/result_codes_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'selection_event_type_java',
'type': 'none',
- 'variables': {
- 'source_file': 'browser/renderer_host/input/selection_event_type.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/input/SelectionEventType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/browser/input',
+ 'template_deps': ['browser/renderer_host/input/selection_event_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'speech_recognition_error_java',
'type': 'none',
- 'variables': {
- 'source_file': 'public/common/speech_recognition_error.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/SpeechRecognitionError.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/browser',
+ 'template_deps': ['public/common/speech_recognition_error_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'top_controls_state_java',
'type': 'none',
- 'variables': {
- 'source_file': 'public/common/top_controls_state.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/common/TopControlsState.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/common',
+ 'template_deps': ['public/common/top_controls_state_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'screen_orientation_values_java',
'type': 'none',
- 'variables': {
- 'source_file': 'public/common/screen_orientation_values.h',
- },
- 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ 'sources': [
+ 'public/android/java/src/org/chromium/content_public/common/ScreenOrientationValues.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content_public/common',
+ 'template_deps': ['public/common/screen_orientation_values_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
'target_name': 'java_set_jni_headers',
@@ -570,6 +590,22 @@
}],
],
},
+ {
+ 'target_name': 'content_gamepad_mapping',
+ 'type': 'none',
+ 'sources': [
+ 'public/android/java/src/org/chromium/content/browser/input/CanonicalButtonIndex.template',
+ 'public/android/java/src/org/chromium/content/browser/input/CanonicalAxisIndex.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/browser/input',
+ 'template_deps': [
+ 'browser/gamepad/canonical_axis_index_list.h',
+ 'browser/gamepad/canonical_button_index_list.h',
+ ],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
],
}], # OS == "android"
],
« no previous file with comments | « content/child/assert_matching_enums.cc ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698