summaryrefslogtreecommitdiffstats
path: root/sync
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 /sync
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 'sync')
-rw-r--r--sync/BUILD.gn16
1 files changed, 1 insertions, 15 deletions
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 65af3de..df5f23a 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//testing/test.gni")
component("sync") {
public_deps = [
@@ -645,13 +646,6 @@ test("sync_unit_tests") {
":test_support_sync_internal_api",
]
- # TODO(GYP)
- # ['OS == "android"', {
- # 'dependencies': [
- # '../testing/android/native_test.gyp:native_test_native_code',
- # ],
- # }],
-
if (is_chromeos) {
# Required by get_session_name_unittest.cc on Chrome OS.
deps += [ "//chromeos" ]
@@ -812,12 +806,4 @@ if (is_android) {
"//base",
]
}
-
- # GYP: //sync/sync_tests.gypi:sync_unit_tests_apk
- unittest_apk("sync_unit_tests_apk") {
- unittests_dep = ":sync_unit_tests"
- deps = [
- ":sync_unit_tests",
- ]
- }
}