Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: chrome/test/BUILD.gn

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_web_ui_mojo_bindings.gyp ('k') | components/nacl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 8
9 # This target exists to reference other test executables to bring these files 9 # This target exists to reference other test executables to bring these files
10 # into the build. 10 # into the build.
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 "base/run_all_unittests.cc", 202 "base/run_all_unittests.cc",
203 ] 203 ]
204 204
205 deps = [ 205 deps = [
206 ":test_support", 206 ":test_support",
207 "//base", 207 "//base",
208 "//chrome:resources", 208 "//chrome:resources",
209 "//chrome:strings", 209 "//chrome:strings",
210 "//chrome/browser", 210 "//chrome/browser",
211 "//chrome/common", 211 "//chrome/common",
212 "//mojo/edk/system",
213 "//mojo/environment:chromium", 212 "//mojo/environment:chromium",
213 "//third_party/mojo/src/mojo/edk/system",
214 ] 214 ]
215 } 215 }
216 216
217 if (!is_android) { 217 if (!is_android) {
218 gypi_values = exec_script("//build/gypi_to_gn.py", 218 gypi_values = exec_script("//build/gypi_to_gn.py",
219 [ rebase_path("../chrome_tests.gypi") ], 219 [ rebase_path("../chrome_tests.gypi") ],
220 "scope", 220 "scope",
221 [ "../chrome_tests.gypi" ]) 221 [ "../chrome_tests.gypi" ])
222 222
223 test("interactive_ui_tests") { 223 test("interactive_ui_tests") {
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
1175 # TODO(GYP) CDM adapter stuff. 1175 # TODO(GYP) CDM adapter stuff.
1176 #if (enable_pepper_cdms) { 1176 #if (enable_pepper_cdms) {
1177 # deps += [ 1177 # deps += [
1178 # "//media/cdm/ppapi:clearkeycdmadapter", 1178 # "//media/cdm/ppapi:clearkeycdmadapter",
1179 # "//ppapi:ppapi_cpp", 1179 # "//ppapi:ppapi_cpp",
1180 # "//third_party/widevine/cdm:adapter", 1180 # "//third_party/widevine/cdm:adapter",
1181 # ] 1181 # ]
1182 #} 1182 #}
1183 } 1183 }
1184 } 1184 }
OLDNEW
« no previous file with comments | « chrome/chrome_web_ui_mojo_bindings.gyp ('k') | components/nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698