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

Side by Side Diff: device/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 | « content/test/run_all_unittests.cc ('k') | device/battery/BUILD.gn » ('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 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("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/rules.gni") # For generate_jni(). 9 import("//build/config/android/rules.gni") # For generate_jni().
10 } 10 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ] 57 ]
58 58
59 deps = [ 59 deps = [
60 "//base/test:test_support", 60 "//base/test:test_support",
61 "//device/battery", 61 "//device/battery",
62 "//device/battery:mojo_bindings", 62 "//device/battery:mojo_bindings",
63 "//device/bluetooth", 63 "//device/bluetooth",
64 "//device/bluetooth:mocks", 64 "//device/bluetooth:mocks",
65 "//device/nfc", 65 "//device/nfc",
66 "//mojo/common", 66 "//mojo/common",
67 "//mojo/edk/system",
67 "//mojo/environment:chromium", 68 "//mojo/environment:chromium",
68 "//mojo/public/cpp/bindings", 69 "//mojo/public/cpp/bindings",
69 "//net", 70 "//net",
70 "//testing/gmock", 71 "//testing/gmock",
71 "//testing/gtest", 72 "//testing/gtest",
72 "//third_party/mojo/src/mojo/edk/system",
73 "//url", 73 "//url",
74 ] 74 ]
75 75
76 if (!is_linux_without_dbus && !is_chromeos) { 76 if (!is_linux_without_dbus && !is_chromeos) {
77 sources += [ "battery/battery_status_manager_linux_unittest.cc" ] 77 sources += [ "battery/battery_status_manager_linux_unittest.cc" ]
78 } 78 }
79 79
80 # HID and Serial: 80 # HID and Serial:
81 # Android doesn't compile. 81 # Android doesn't compile.
82 # Linux, requires udev. 82 # Linux, requires udev.
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 } 198 }
199 199
200 android_library("bluetooth_test_java") { 200 android_library("bluetooth_test_java") {
201 java_files = bluetooth_java_sources_needing_jni 201 java_files = bluetooth_java_sources_needing_jni
202 deps = [ 202 deps = [
203 "//base:base_java", 203 "//base:base_java",
204 "//device/bluetooth:java", 204 "//device/bluetooth:java",
205 ] 205 ]
206 } 206 }
207 } 207 }
OLDNEW
« no previous file with comments | « content/test/run_all_unittests.cc ('k') | device/battery/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698