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

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

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 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_tests_unit.gypi ('k') | chrome/test/DEPS » ('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/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/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 2200 matching lines...) Expand 10 before | Expand all | Expand 10 after
2211 "base/run_all_unittests.cc", 2211 "base/run_all_unittests.cc",
2212 ] 2212 ]
2213 2213
2214 public_deps = [ 2214 public_deps = [
2215 ":test_support", 2215 ":test_support",
2216 "//base", 2216 "//base",
2217 "//chrome:resources", 2217 "//chrome:resources",
2218 "//chrome:strings", 2218 "//chrome:strings",
2219 "//chrome/browser", 2219 "//chrome/browser",
2220 "//chrome/common", 2220 "//chrome/common",
2221 "//mojo/edk/system",
2221 "//mojo/environment:chromium", 2222 "//mojo/environment:chromium",
2222 "//third_party/mojo/src/mojo/edk/system",
2223 ] 2223 ]
2224 2224
2225 if (!is_android && use_ash) { 2225 if (!is_android && use_ash) {
2226 sources += rebase_path( 2226 sources += rebase_path(
2227 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 2227 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
2228 ".", 2228 ".",
2229 "//chrome") 2229 "//chrome")
2230 } 2230 }
2231 } 2231 }
2232 2232
2233 if (is_android) { 2233 if (is_android) {
2234 android_library("unit_tests_java") { 2234 android_library("unit_tests_java") {
2235 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2235 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2236 deps = [ 2236 deps = [
2237 "//base:base_java", 2237 "//base:base_java",
2238 "//chrome/android:chrome_java", 2238 "//chrome/android:chrome_java",
2239 "//content/public/android:content_java", 2239 "//content/public/android:content_java",
2240 ] 2240 ]
2241 } 2241 }
2242 } 2242 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698