| Index: content/test/BUILD.gn
|
| diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
| index 80e75581140ca27161aef07b8874fb96163b8e4f..eae2cd819b0b3e9d3314c4720103c411508ba71d 100644
|
| --- a/content/test/BUILD.gn
|
| +++ b/content/test/BUILD.gn
|
| @@ -5,12 +5,14 @@
|
| import("//build/config/features.gni")
|
| import("//build/config/ui.gni")
|
|
|
| -content_tests_gypi_values = exec_script(
|
| - "//build/gypi_to_gn.py",
|
| - [ rebase_path("../content_tests.gypi"),
|
| - "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir" ],
|
| - "scope",
|
| - [ "../content_tests.gypi" ])
|
| +content_tests_gypi_values =
|
| + exec_script("//build/gypi_to_gn.py",
|
| + [
|
| + rebase_path("../content_tests.gypi"),
|
| + "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
|
| + ],
|
| + "scope",
|
| + [ "../content_tests.gypi" ])
|
|
|
| # GYP version //content/content_tests.gypi:test_support_content
|
| static_library("test_support") {
|
| @@ -40,12 +42,12 @@ static_library("test_support") {
|
| ]
|
|
|
| if (!is_ios) {
|
| - sources = rebase_path(content_tests_gypi_values.test_support_content_sources,
|
| - ".", "//content")
|
| + sources =
|
| + rebase_path(content_tests_gypi_values.test_support_content_sources,
|
| + ".",
|
| + "//content")
|
|
|
| - public_deps += [
|
| - "//third_party/WebKit/public:blink",
|
| - ]
|
| + public_deps += [ "//third_party/WebKit/public:blink" ]
|
| deps += [
|
| "//content/browser/speech/proto",
|
| "//content/public/child:child_sources",
|
| @@ -131,7 +133,7 @@ static_library("test_support") {
|
| if (is_win) {
|
| deps += [ "//sandbox" ]
|
| }
|
| - } else { # is_ios
|
| + } else { # is_ios
|
| sources = [
|
| "public/test/content_test_suite_base.cc",
|
| "public/test/mock_notification_observer.cc",
|
| @@ -149,12 +151,13 @@ static_library("test_support") {
|
| }
|
|
|
| if (!is_ios) {
|
| -
|
| # GYP version //content/content_tests.gypi:layouttest_support_content
|
| static_library("layouttest_support") {
|
| testonly = true
|
| - sources = rebase_path(content_tests_gypi_values.layouttest_support_content_sources,
|
| - ".", "//content")
|
| + sources = rebase_path(
|
| + content_tests_gypi_values.layouttest_support_content_sources,
|
| + ".",
|
| + "//content")
|
|
|
| deps = [
|
| ":test_support",
|
| @@ -175,11 +178,11 @@ if (!is_ios) {
|
| import("//build/config/android/rules.gni")
|
|
|
| generate_jni("jni") {
|
| - sources = [ "../public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java" ]
|
| + sources = [
|
| + "../public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java",
|
| + ]
|
| jni_package = "content/public/test"
|
| }
|
| }
|
| } # !is_ios
|
| -
|
| # TODO(GYP): Unit test targets
|
| -
|
|
|