summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorqsr <qsr@chromium.org>2015-01-21 07:57:22 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-21 15:58:20 +0000
commitfb5251d1ff4f36ea296da4be72ddf26a9e3e5643 (patch)
tree2ad55b0c4bf8cbc75fde7692f9c6a441d589b304 /mojo
parent063efcf45e7d9ea6eb65ace73220b380d47a591a (diff)
downloadchromium_src-fb5251d1ff4f36ea296da4be72ddf26a9e3e5643.zip
chromium_src-fb5251d1ff4f36ea296da4be72ddf26a9e3e5643.tar.gz
chromium_src-fb5251d1ff4f36ea296da4be72ddf26a9e3e5643.tar.bz2
Move the test template to //testing/test.gni (part 2)
This CL move the test target from build/config/BUILDCONFIG.gn to testing/test.gni It also update the test template to automatically build an apk on Android. R=cjhopman@chromium.org,brettw@chromium.org Review URL: https://codereview.chromium.org/824263004 Cr-Commit-Position: refs/heads/master@{#312396}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/common/BUILD.gn2
-rw-r--r--mojo/converters/surfaces/tests/BUILD.gn2
-rw-r--r--mojo/services/html_viewer/BUILD.gn1
-rw-r--r--mojo/services/view_manager/public/cpp/tests/BUILD.gn1
4 files changed, 6 insertions, 0 deletions
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index 4248ff2..ad01c31 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//testing/test.gni")
+
# GYP version: mojo/mojo_base.gyp:mojo_common_lib
component("common") {
output_name = "mojo_common_lib"
diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
index 6e60f08..efbd72f 100644
--- a/mojo/converters/surfaces/tests/BUILD.gn
+++ b/mojo/converters/surfaces/tests/BUILD.gn
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//testing/test.gni")
+
# GYP version: mojo/mojo_converters.gypi:mojo_surfaces_lib_unittests
test("mojo_surfaces_lib_unittests") {
deps = [
diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
index d802032..1d2c63d 100644
--- a/mojo/services/html_viewer/BUILD.gn
+++ b/mojo/services/html_viewer/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("//testing/test.gni")
import("//third_party/mojo/src/mojo/public/mojo.gni")
import("//third_party/mojo/src/mojo/public/mojo_application.gni")
diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
index ec164ac..2cbcf43 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
+import("//testing/test.gni")
test("mojo_view_manager_lib_unittests") {
sources = [