diff options
| author | qsr <qsr@chromium.org> | 2015-01-21 07:57:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 15:58:20 +0000 |
| commit | fb5251d1ff4f36ea296da4be72ddf26a9e3e5643 (patch) | |
| tree | 2ad55b0c4bf8cbc75fde7692f9c6a441d589b304 /skia/BUILD.gn | |
| parent | 063efcf45e7d9ea6eb65ace73220b380d47a591a (diff) | |
| download | chromium_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 'skia/BUILD.gn')
| -rw-r--r-- | skia/BUILD.gn | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index eb54593..8bb5dcd 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -4,12 +4,10 @@ import("//build/config/features.gni") import("//build/config/ui.gni") +import("//testing/test.gni") if (cpu_arch == "arm") { import("//build/config/arm.gni") } -if (is_android) { - import("//build/config/android/rules.gni") -} skia_support_gpu = !is_ios skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview) @@ -746,13 +744,3 @@ test("skia_unittests") { "//ui/gfx/geometry", ] } - -if (is_android) { - # GYP: //skia/skia_tests.gyp:skia_unittests_apk - unittest_apk("skia_unittests_apk") { - unittests_dep = ":skia_unittests" - deps = [ - ":skia_unittests", - ] - } -} |