Commit 16b832a7 authored by Sven Zheng's avatar Sven Zheng Committed by Commit Bot

Adds android_sync_integration_tests target

First adds the target with one test file in it. Now it can compile
and run on device, and fails. I will get the target pass in the following
work.

Bug: 1117345
Change-Id: If3acc03e002a5ec23f1bcac5bff0ff7b1e3403a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2360598
Commit-Queue: Sven Zheng <svenzheng@chromium.org>
Reviewed-by: default avatarIan Struiksma <ianstruiksma@google.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800298}
parent e0fd1008
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/sync/test/integration/typed_urls_helper.h" #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
......
...@@ -543,6 +543,43 @@ if (is_android) { ...@@ -543,6 +543,43 @@ if (is_android) {
] ]
} }
test("android_sync_integration_tests") {
configs += [ "//build/config:precompiled_headers" ]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
use_default_launcher = false
android_manifest =
"${target_gen_dir}/android_browsertests_manifest/AndroidManifest.xml"
android_manifest_dep = ":android_browsertests_manifest"
deps = [
":android_browsertests_assets",
":android_browsertests_java",
":browser_tests_runner",
":sync_integration_test_support",
":sync_integration_test_support_java",
":test_support",
":test_support_java",
":test_support_ui_android",
"//chrome:chrome_android_core",
"//chrome/android:app_hooks_java",
"//content/test:android_test_message_pump_support",
"//testing/android/native_test:native_test_support",
]
sources = [
"../browser/sync/test/integration/single_client_typed_urls_sync_test.cc",
"android/browsertests_apk/android_browsertests_jni_onload.cc",
]
data = [
"$root_gen_dir/chrome/android/chrome_apk_paks/chrome_100_percent.pak",
"$root_gen_dir/chrome/android/chrome_apk_paks/locales/en-US.pak",
"$root_gen_dir/chrome/android/chrome_apk_paks/resources.pak",
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/components/dev_ui_components_resources.pak",
]
}
static_library("test_support_ui_android") { static_library("test_support_ui_android") {
configs += [ "//build/config:precompiled_headers" ] configs += [ "//build/config:precompiled_headers" ]
testonly = true testonly = true
...@@ -6451,6 +6488,8 @@ if (!is_fuchsia) { ...@@ -6451,6 +6488,8 @@ if (!is_fuchsia) {
"../browser/sync/test/integration/sync_signin_delegate.h", "../browser/sync/test/integration/sync_signin_delegate.h",
"../browser/sync/test/integration/sync_test.cc", "../browser/sync/test/integration/sync_test.cc",
"../browser/sync/test/integration/sync_test.h", "../browser/sync/test/integration/sync_test.h",
"../browser/sync/test/integration/typed_urls_helper.cc",
"../browser/sync/test/integration/typed_urls_helper.h",
"../browser/sync/test/integration/updated_progress_marker_checker.cc", "../browser/sync/test/integration/updated_progress_marker_checker.cc",
"../browser/sync/test/integration/updated_progress_marker_checker.h", "../browser/sync/test/integration/updated_progress_marker_checker.h",
] ]
...@@ -6512,8 +6551,6 @@ if (!is_fuchsia) { ...@@ -6512,8 +6551,6 @@ if (!is_fuchsia) {
"../browser/sync/test/integration/sync_signin_delegate_desktop.h", "../browser/sync/test/integration/sync_signin_delegate_desktop.h",
"../browser/sync/test/integration/themes_helper.cc", "../browser/sync/test/integration/themes_helper.cc",
"../browser/sync/test/integration/themes_helper.h", "../browser/sync/test/integration/themes_helper.h",
"../browser/sync/test/integration/typed_urls_helper.cc",
"../browser/sync/test/integration/typed_urls_helper.h",
"../browser/sync/test/integration/user_events_helper.cc", "../browser/sync/test/integration/user_events_helper.cc",
"../browser/sync/test/integration/user_events_helper.h", "../browser/sync/test/integration/user_events_helper.h",
"../browser/sync/test/integration/wallet_helper.cc", "../browser/sync/test/integration/wallet_helper.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment