summaryrefslogtreecommitdiffstats
path: root/google_apis
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 /google_apis
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 'google_apis')
-rw-r--r--google_apis/BUILD.gn1
-rw-r--r--google_apis/gcm/BUILD.gn1
2 files changed, 2 insertions, 0 deletions
diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn
index bf71ce3..b07feb7 100644
--- a/google_apis/BUILD.gn
+++ b/google_apis/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//testing/test.gni")
declare_args() {
# You can set the variable 'use_official_google_api_keys' to true
diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn
index d21a057..83412b69 100644
--- a/google_apis/gcm/BUILD.gn
+++ b/google_apis/gcm/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/protobuf/proto_library.gni")
component("gcm") {