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

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

Issue 824263004: Move the test template to //testing/test.gni (part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 months 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
« no previous file with comments | « third_party/mojo/src/mojo/edk/js/test/BUILD.gn ('k') | third_party/mojo/src/mojo/edk/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/src/mojo/edk/system/BUILD.gn
diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn
index 2f8abdde615119b56010815e19e4d34cd0015d1d..eab85a231d6451b9da2ff7484a83f7f5fee5f97e 100644
--- a/third_party/mojo/src/mojo/edk/system/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn
@@ -2,13 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//testing/test.gni")
import("../mojo_edk.gni")
-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.
@@ -173,10 +169,6 @@ test("mojo_system_unittests") {
"//testing/gtest",
]
- if (is_android) {
- deps += [ "//testing/android:native_test_native_code" ]
- }
-
allow_circular_includes_from = [ "../embedder:embedder_unittests" ]
}
@@ -198,12 +190,3 @@ 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"
- }
-}
« no previous file with comments | « third_party/mojo/src/mojo/edk/js/test/BUILD.gn ('k') | third_party/mojo/src/mojo/edk/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698