| Index: base/test/BUILD.gn
|
| diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
|
| index 23ac1420269bb700c6e22781feebef6e4822ae9d..6940bc43547de8e76e510cab0f897386d596f451 100644
|
| --- a/base/test/BUILD.gn
|
| +++ b/base/test/BUILD.gn
|
| @@ -2,6 +2,7 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import("//build/config/android/rules.gni")
|
| import("//build/config/ui.gni")
|
|
|
| source_set("test_support") {
|
| @@ -52,10 +53,13 @@ source_set("test_support") {
|
| "simple_test_clock.h",
|
| "simple_test_tick_clock.cc",
|
| "simple_test_tick_clock.h",
|
| + "statistics_delta_reader.cc",
|
| + "statistics_delta_reader.h",
|
| "task_runner_test_template.cc",
|
| "task_runner_test_template.h",
|
| "test_file_util.cc",
|
| "test_file_util.h",
|
| + "test_file_util_android.cc",
|
| "test_file_util_linux.cc",
|
| "test_file_util_mac.cc",
|
| "test_file_util_posix.cc",
|
| @@ -114,8 +118,9 @@ source_set("test_support") {
|
| set_sources_assignment_filter([])
|
| sources += [ "test_file_util_mac.cc" ]
|
| }
|
| - if (toolkit_uses_gtk) {
|
| - configs += [ "//build/config/linux:gtk" ]
|
| +
|
| + if (is_android) {
|
| + deps += [ ":base_unittests_jni_headers" ]
|
| }
|
| }
|
|
|
| @@ -134,10 +139,6 @@ static_library("test_support_perf") {
|
| ]
|
|
|
| direct_dependent_configs = [ ":perf_test_config" ]
|
| -
|
| - if (toolkit_uses_gtk) {
|
| - configs += [ "//build/config/linux:gtk" ]
|
| - }
|
| }
|
|
|
| source_set("run_all_unittests") {
|
| @@ -148,3 +149,12 @@ source_set("run_all_unittests") {
|
| ":test_support",
|
| ]
|
| }
|
| +
|
| +if (is_android) {
|
| + generate_jni("base_unittests_jni_headers") {
|
| + sources = [
|
| + "android/java/src/org/chromium/base/ContentUriTestUtils.java",
|
| + ]
|
| + jni_package = "base"
|
| + }
|
| +}
|
|
|