X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fpublic%2Fandroid%2FBUILD.gn;h=94bb8780b175dc4329e8302a76f1652db1a82db0;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=81615c3dc187d93016084bc6b53ae37db4bda43f;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/public/android/BUILD.gn b/src/content/public/android/BUILD.gn index 81615c3..94bb878 100644 --- a/src/content/public/android/BUILD.gn +++ b/src/content/public/android/BUILD.gn @@ -33,6 +33,9 @@ android_library("content_java") { ":content_java_resources", "//base:base_java", "//media/base/android:media_java", + "//mojo/android:system_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//net/android:net_java", "//ui/android:ui_java", "//third_party/jsr-305:jsr_305_javalib", @@ -42,14 +45,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 +106,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_public/common/ResultCode.java", + "org/chromium/content_public/common/ScreenOrientationValues.java", + "org/chromium/content_public/common/SpeechRecognitionErrorCode.java", + "org/chromium/content_public/common/TopControlsState.java", ] } @@ -223,6 +161,10 @@ android_library("content_javatests") { "//content/shell/android:content_shell_apk_java", "//content/shell/android:content_shell_test_java", "//media/base/android:media_java", + "//mojo/android:system_java", + "//mojo/public/interfaces/bindings/tests:test_interfaces_java", + "//mojo/public/java:bindings", + "//mojo/public/java:system", "//net/android:net_java", "//net/android:net_java_test_support", "//ui/android:ui_java",