| Index: content/public/android/BUILD.gn
|
| diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
|
| index 81615c3dc187d93016084bc6b53ae37db4bda43f..815341fd3f2d99da14b40ad8ac4b5a31e24ea441 100644
|
| --- a/content/public/android/BUILD.gn
|
| +++ b/content/public/android/BUILD.gn
|
| @@ -42,14 +42,7 @@ android_library("content_java") {
|
|
|
| srcjar_deps = [
|
| ":common_aidl",
|
| - ":content_gamepad_mapping_java",
|
| - ":gesture_event_type_java",
|
| - ":popup_item_type_java",
|
| - ":result_codes_java",
|
| - ":selection_event_type_java",
|
| - ":speech_recognition_error_java",
|
| - ":top_controls_state_java",
|
| - ":screen_orientation_values_java",
|
| + ":content_public_android_java_enums_srcjar",
|
| ]
|
|
|
| DEPRECATED_java_in_dir = "java/src"
|
| @@ -110,85 +103,27 @@ java_strings_grd("content_strings_grd") {
|
| ]
|
| }
|
|
|
| -java_cpp_template("gesture_event_type_java") {
|
| +java_cpp_enum("content_public_android_java_enums_srcjar") {
|
| sources = [
|
| - "java/src/org/chromium/content/browser/GestureEventType.template",
|
| + "//content/browser/android/content_view_core_impl.cc",
|
| + "//content/browser/android/gesture_event_type.h",
|
| + "//content/browser/renderer_host/input/selection_event_type.h",
|
| + "//content/browser/gamepad/gamepad_standard_mappings.h",
|
| + "//content/public/common/result_codes.h",
|
| + "//content/public/common/screen_orientation_values.h",
|
| + "//content/public/common/speech_recognition_error.h",
|
| + "//content/public/common/top_controls_state.h",
|
| ]
|
| - package_name = "org/chromium/content/browser"
|
| - inputs = [
|
| - "//content/browser/android/gesture_event_type_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("popup_item_type_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/browser/input/PopupItemType.template",
|
| - ]
|
| - package_name = "org/chromium/content/browser/input"
|
| - inputs = [
|
| - "//content/browser/android/popup_item_type_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("result_codes_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/common/ResultCodes.template",
|
| - ]
|
| - package_name = "org/chromium/content/common"
|
| - inputs = [
|
| - "//content/public/common/result_codes_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("selection_event_type_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/browser/input/SelectionEventType.template",
|
| - ]
|
| - package_name = "org/chromium/content/browser/input"
|
| - inputs = [
|
| - "//content/browser/renderer_host/input/selection_event_type_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("speech_recognition_error_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/browser/SpeechRecognitionError.template",
|
| - ]
|
| - package_name = "org/chromium/content/browser"
|
| - inputs = [
|
| - "//content/public/common/speech_recognition_error_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("top_controls_state_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/common/TopControlsState.template",
|
| - ]
|
| - package_name = "org/chromium/content/common"
|
| - inputs = [
|
| - "//content/public/common/top_controls_state_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("screen_orientation_values_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content_public/common/ScreenOrientationValues.template",
|
| - ]
|
| - package_name = "org/chromium/content_public/common"
|
| - inputs = [
|
| - "//content/public/common/screen_orientation_values_list.h"
|
| - ]
|
| -}
|
| -
|
| -java_cpp_template("content_gamepad_mapping_java") {
|
| - sources = [
|
| - "java/src/org/chromium/content/browser/input/CanonicalAxisIndex.template",
|
| - "java/src/org/chromium/content/browser/input/CanonicalButtonIndex.template",
|
| - ]
|
| - package_name = "org/chromium/content/common"
|
| - inputs = [
|
| - "//content/browser/gamepad/canonical_axis_index_list.h",
|
| - "//content/browser/gamepad/canonical_button_index_list.h",
|
| + outputs = [
|
| + "org/chromium/content/browser/GestureEventType.java",
|
| + "org/chromium/content/browser/input/CanonicalAxisIndex.java",
|
| + "org/chromium/content/browser/input/CanonicalButtonIndex.java",
|
| + "org/chromium/content/browser/input/PopupItemType.java",
|
| + "org/chromium/content/browser/input/SelectionEventType.java",
|
| + "org/chromium/content/common/ResultCode.java",
|
| + "org/chromium/content/common/TopControlsState.java",
|
| + "org/chromium/content_public/common/ScreenOrientationValues.java",
|
| + "org/chromium/content_public/common/SpeechRecognitionErrorCode.java",
|
| ]
|
| }
|
|
|
|
|