Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1677)

Unified Diff: mojo/edk/system/BUILD.gn

Issue 728783003: Add infrastructure to run tests on android. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow review Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/system/BUILD.gn
diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn
index d09d3d46d13e486ce305758d3c3eca693e0b6640..bd355b0f62eb4538aff0ca98d09d9070476ca980 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.
@@ -99,7 +104,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",
@@ -142,10 +146,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",
@@ -164,3 +173,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"
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698