| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 4945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4956 } | 4956 } |
| 4957 | 4957 |
| 4958 service_manifest("mash_browser_tests_manifest") { | 4958 service_manifest("mash_browser_tests_manifest") { |
| 4959 name = "mash_browser_tests" | 4959 name = "mash_browser_tests" |
| 4960 source = "base/mash_browser_tests_manifest.json" | 4960 source = "base/mash_browser_tests_manifest.json" |
| 4961 } | 4961 } |
| 4962 | 4962 |
| 4963 catalog("mash_browser_tests_catalog") { | 4963 catalog("mash_browser_tests_catalog") { |
| 4964 testonly = true | 4964 testonly = true |
| 4965 embedded_services = [ ":mash_browser_tests_manifest" ] | 4965 embedded_services = [ ":mash_browser_tests_manifest" ] |
| 4966 standalone_services = [ "//services/tracing:manifest" ] | |
| 4967 catalog_deps = [ "//chrome/app/mash:catalog" ] | 4966 catalog_deps = [ "//chrome/app/mash:catalog" ] |
| 4968 } | 4967 } |
| 4969 | 4968 |
| 4970 copy("mash_browser_tests_catalog_copy") { | 4969 copy("mash_browser_tests_catalog_copy") { |
| 4971 testonly = true | 4970 testonly = true |
| 4972 sources = get_target_outputs(":mash_browser_tests_catalog") | 4971 sources = get_target_outputs(":mash_browser_tests_catalog") |
| 4973 outputs = [ | 4972 outputs = [ |
| 4974 "${root_out_dir}/mash_browser_tests_catalog.json", | 4973 "${root_out_dir}/mash_browser_tests_catalog.json", |
| 4975 ] | 4974 ] |
| 4976 deps = [ | 4975 deps = [ |
| (...skipping 16 matching lines...) Expand all Loading... |
| 4993 } | 4992 } |
| 4994 | 4993 |
| 4995 service_manifest("mus_browser_tests_manifest") { | 4994 service_manifest("mus_browser_tests_manifest") { |
| 4996 name = "mus_browser_tests" | 4995 name = "mus_browser_tests" |
| 4997 source = "base/mus_browser_tests_manifest.json" | 4996 source = "base/mus_browser_tests_manifest.json" |
| 4998 } | 4997 } |
| 4999 | 4998 |
| 5000 catalog("mus_browser_tests_catalog") { | 4999 catalog("mus_browser_tests_catalog") { |
| 5001 testonly = true | 5000 testonly = true |
| 5002 embedded_services = [ ":mus_browser_tests_manifest" ] | 5001 embedded_services = [ ":mus_browser_tests_manifest" ] |
| 5003 standalone_services = [ "//services/tracing:manifest" ] | |
| 5004 catalog_deps = [ "//chrome/app/mash:catalog_mus" ] | 5002 catalog_deps = [ "//chrome/app/mash:catalog_mus" ] |
| 5005 } | 5003 } |
| 5006 | 5004 |
| 5007 copy("mus_browser_tests_catalog_copy") { | 5005 copy("mus_browser_tests_catalog_copy") { |
| 5008 testonly = true | 5006 testonly = true |
| 5009 sources = get_target_outputs(":mus_browser_tests_catalog") | 5007 sources = get_target_outputs(":mus_browser_tests_catalog") |
| 5010 outputs = [ | 5008 outputs = [ |
| 5011 "${root_out_dir}/mus_browser_tests_catalog.json", | 5009 "${root_out_dir}/mus_browser_tests_catalog.json", |
| 5012 ] | 5010 ] |
| 5013 deps = [ | 5011 deps = [ |
| 5014 ":mus_browser_tests_catalog", | 5012 ":mus_browser_tests_catalog", |
| 5015 ] | 5013 ] |
| 5016 } | 5014 } |
| 5017 } | 5015 } |
| 5018 | 5016 |
| 5019 if (is_win) { | 5017 if (is_win) { |
| 5020 loadable_module("conflicts_dll") { | 5018 loadable_module("conflicts_dll") { |
| 5021 testonly = true | 5019 testonly = true |
| 5022 sources = [ | 5020 sources = [ |
| 5023 "conflicts/conflicts_dll.cc", | 5021 "conflicts/conflicts_dll.cc", |
| 5024 ] | 5022 ] |
| 5025 } | 5023 } |
| 5026 } | 5024 } |
| OLD | NEW |