| Index: mojo/edk/system/BUILD.gn
|
| diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
|
| index d0bfda78875e957f52691f703b87addde39269f7..c25ce8b8419f02ac83d62063f1c040e2245daf10 100644
|
| --- a/mojo/edk/system/BUILD.gn
|
| +++ b/mojo/edk/system/BUILD.gn
|
| @@ -2,6 +2,11 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +if (is_android) {
|
| + import("//build/config/android/config.gni")
|
| + import("//build/config/android/rules.gni")
|
| +}
|
| +
|
| config("system_config") {
|
| defines = [
|
| # Ensures that dependent projects import the core functions on Windows.
|
| @@ -98,7 +103,6 @@ component("system") {
|
| allow_circular_includes_from = [ "//mojo/edk/embedder" ]
|
| }
|
|
|
| -# GYP version: mojo/edk/mojo_edk.gyp:mojo_system_unittests
|
| test("mojo_system_unittests") {
|
| sources = [
|
| "../test/multiprocess_test_helper_unittest.cc",
|
| @@ -141,10 +145,15 @@ test("mojo_system_unittests") {
|
| "//testing/gtest",
|
| ]
|
|
|
| + if (is_android) {
|
| + deps += [
|
| + "//testing/android:native_test_native_code",
|
| + ]
|
| + }
|
| +
|
| allow_circular_includes_from = [ "//mojo/edk/embedder:embedder_unittests" ]
|
| }
|
|
|
| -# GYP version: mojo/edk/mojo_edk.gyp:mojo_message_pipe_perftests
|
| test("mojo_message_pipe_perftests") {
|
| sources = [
|
| "message_pipe_perftest.cc",
|
| @@ -163,3 +172,12 @@ test("mojo_message_pipe_perftests") {
|
| "//testing/gtest",
|
| ]
|
| }
|
| +
|
| +if (is_android) {
|
| + unittest_apk("mojo_system_unittests_apk") {
|
| + deps = [
|
| + ":mojo_system_unittests",
|
| + ]
|
| + unittests_dep = ":mojo_system_unittests"
|
| + }
|
| +}
|
|
|