| OLD | NEW | 
|   1 # Copyright 2015 The Chromium Authors. All rights reserved. |   1 # Copyright 2015 The Chromium Authors. All rights reserved. | 
|   2 # Use of this source code is governed by a BSD-style license that can be |   2 # Use of this source code is governed by a BSD-style license that can be | 
|   3 # found in the LICENSE file. |   3 # found in the LICENSE file. | 
|   4  |   4  | 
|   5 import("//services/service_manager/public/service_manifest.gni") |   5 import("//services/service_manager/public/service_manifest.gni") | 
|   6 import("//testing/test.gni") |   6 import("//testing/test.gni") | 
|   7  |   7  | 
|   8 # Target that builders build. |   8 # Target that builders build. | 
|   9 group("all") { |   9 group("all") { | 
|  10   testonly = true |  10   testonly = true | 
|  11  |  11  | 
|  12   deps = [ |  12   deps = [ | 
|  13     "//components/leveldb", |  13     "//components/leveldb", | 
|  14     "//mash/catalog_viewer", |  14     "//mash/catalog_viewer", | 
|  15     "//mash/example", |  15     "//mash/example", | 
|  16     "//mash/init", |  16     "//mash/init", | 
|  17     "//mash/login", |  17     "//mash/login", | 
|  18     "//mash/screenlock", |  18     "//mash/screenlock", | 
|  19     "//mash/session", |  19     "//mash/session", | 
|  20     "//mash/simple_wm", |  20     "//mash/simple_wm", | 
|  21     "//mash/task_viewer", |  21     "//mash/task_viewer", | 
|  22   ] |  22   ] | 
|  23  |  23  | 
|  24   # Build on platforms that support ash. |  24   # Build on platforms that support ash. | 
|  25   if (is_win || is_chromeos) { |  25   if (is_chromeos) { | 
|  26     deps += [ "//mash:mash_unittests" ] |  26     deps += [ "//mash:mash_unittests" ] | 
|  27   } |  27   } | 
|  28 } |  28 } | 
|  29  |  29  | 
|  30 group("browser") { |  30 group("browser") { | 
|  31   testonly = true |  31   testonly = true | 
|  32  |  32  | 
|  33   deps = [ |  33   deps = [ | 
|  34     ":all", |  34     ":all", | 
|  35     "//mash/browser", |  35     "//mash/browser", | 
|  36     "//mash/webtest", |  36     "//mash/webtest", | 
|  37   ] |  37   ] | 
|  38 } |  38 } | 
|  39  |  39  | 
|  40 test("mash_unittests") { |  40 if (is_chromeos) { | 
|  41   sources = [ |  41   # TODO(jamescook): Move these tests into //ash/mus. | 
|  42     "test/mash_test_suite.cc", |  42   test("mash_unittests") { | 
|  43     "test/mash_test_suite.h", |  43     sources = [ | 
|  44     "test/mash_unittests.cc", |  44       "test/mash_test_suite.cc", | 
|  45   ] |  45       "test/mash_test_suite.h", | 
|  46   deps = [ |  46       "test/mash_unittests.cc", | 
|  47     "//ash/common:unittests", |  47     ] | 
|  48     "//ash/common/test:test_support", |  48     deps = [ | 
|  49     "//ash/mus:resources", |  49       "//ash/common:unittests", | 
|  50     "//ash/mus:unittests", |  50       "//ash/common/test:test_support", | 
|  51     "//base", |  51       "//ash/mus:resources", | 
|  52     "//base/test:test_support", |  52       "//ash/mus:unittests", | 
|  53     "//services/service_manager/background:main", |  53       "//base", | 
|  54     "//ui/aura", |  54       "//base/test:test_support", | 
|  55     "//ui/base", |  55       "//services/service_manager/background:main", | 
|  56     "//ui/compositor:test_support", |  56       "//ui/aura", | 
|  57     "//ui/gl:test_support", |  57       "//ui/base", | 
|  58   ] |  58       "//ui/compositor:test_support", | 
|  59   data_deps = [ |  59       "//ui/gl:test_support", | 
|  60     ":unittests_manifest", |  60     ] | 
|  61     "//ash/mus:resources", |  61     data_deps = [ | 
|  62   ] |  62       ":unittests_manifest", | 
 |  63       "//ash/mus:resources", | 
 |  64     ] | 
 |  65   } | 
 |  66  | 
 |  67   service_manifest("unittests_manifest") { | 
 |  68     name = "mash_unittests" | 
 |  69     source = "unittests_manifest.json" | 
 |  70   } | 
|  63 } |  71 } | 
|  64  |  | 
|  65 service_manifest("unittests_manifest") { |  | 
|  66   name = "mash_unittests" |  | 
|  67   source = "unittests_manifest.json" |  | 
|  68 } |  | 
| OLD | NEW |