diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/public/android/BUILD.gn | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/public/android/BUILD.gn')
| -rw-r--r-- | chromium/content/public/android/BUILD.gn | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/content/public/android/BUILD.gn b/chromium/content/public/android/BUILD.gn index fedef329f1c..acc6c3cb82d 100644 --- a/chromium/content/public/android/BUILD.gn +++ b/chromium/content/public/android/BUILD.gn @@ -56,16 +56,13 @@ android_resources("content_java_resources") { ] } -action("generate_sandboxed_service_srcjar") { +action_with_pydeps("generate_sandboxed_service_srcjar") { script = "//content/public/android/generate_child_service.py" - depfile = "$target_gen_dir/$target_name.d" _srcjar_path = "${target_gen_dir}/${target_name}.srcjar" _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir) args = [ - "--depfile", - rebase_path(depfile, root_build_dir), "40", _rebased_srcjar_path, ] @@ -282,6 +279,7 @@ android_library("content_java") { "java/src/org/chromium/content_public/browser/DeviceUtils.java", "java/src/org/chromium/content_public/browser/GestureListenerManager.java", "java/src/org/chromium/content_public/browser/GestureStateListener.java", + "java/src/org/chromium/content_public/browser/GestureStateListenerWithScroll.java", "java/src/org/chromium/content_public/browser/ImageDownloadCallback.java", "java/src/org/chromium/content_public/browser/ImeAdapter.java", "java/src/org/chromium/content_public/browser/ImeEventObserver.java", @@ -347,7 +345,6 @@ java_cpp_enum("content_public_android_java_enums_srcjar") { "//content/public/browser/invalidate_type.h", "//content/public/browser/navigation_controller.h", "//content/public/browser/visibility.h", - "//content/public/browser/xr_consent_prompt_level.h", "//content/public/common/browser_controls_state.h", "//content/public/common/console_message_level.h", "//content/public/common/screen_orientation_values.h", @@ -486,6 +483,7 @@ android_library("content_javatests") { "javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java", "javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java", "javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java", + "javatests/src/org/chromium/content/browser/GestureListenerManagerTest.java", "javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java", "javatests/src/org/chromium/content/browser/JavaBridgeActivityTestRule.java", "javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java", @@ -571,7 +569,10 @@ junit_binary("content_junit_tests") { "//content/public/test/android:content_java_test_support", "//media/mojo/mojom:mojom_java", "//mojo/public/java:bindings_java", + "//mojo/public/mojom/base:base_java", + "//third_party/android_deps:androidx_test_core_java", "//third_party/blink/public/mojom:android_mojo_bindings_java", + "//third_party/hamcrest:hamcrest_java", "//ui/android:ui_java", "//ui/gfx/geometry/mojom:mojom_java", ] |