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

Side by Side Diff: chromeos/BUILD.gn

Issue 2053083002: Build fixes for linux desktop CrOS builders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/test/BUILD.gn ('k') | testing/buildbot/gn_isolate_map.pyl » ('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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 import("//third_party/protobuf/proto_library.gni") 7 import("//third_party/protobuf/proto_library.gni")
8 8
9 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos") 9 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos")
10 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 "//third_party/icu", 169 "//third_party/icu",
170 "//url", 170 "//url",
171 ] 171 ]
172 sources = gypi_values.chromeos_test_sources 172 sources = gypi_values.chromeos_test_sources
173 if (use_binder) { 173 if (use_binder) {
174 if (target_cpu == "arm" || target_cpu == "x86") { 174 if (target_cpu == "arm" || target_cpu == "x86") {
175 defines += [ "BINDER_IPC_32BIT" ] 175 defines += [ "BINDER_IPC_32BIT" ]
176 } 176 }
177 sources += gypi_values.chromeos_binder_test_sources 177 sources += gypi_values.chromeos_binder_test_sources
178 } 178 }
179
180 data = [
181 "test/data/",
182 "//net/data/",
183 ]
179 } 184 }
180 185
181 proto_library("power_manager_proto") { 186 proto_library("power_manager_proto") {
182 sources = [ 187 sources = [
183 "//third_party/cros_system_api/dbus/power_manager/input_event.proto", 188 "//third_party/cros_system_api/dbus/power_manager/input_event.proto",
184 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status. proto", 189 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status. proto",
185 "//third_party/cros_system_api/dbus/power_manager/policy.proto", 190 "//third_party/cros_system_api/dbus/power_manager/policy.proto",
186 "//third_party/cros_system_api/dbus/power_manager/power_supply_properties.pr oto", 191 "//third_party/cros_system_api/dbus/power_manager/power_supply_properties.pr oto",
187 "//third_party/cros_system_api/dbus/power_manager/suspend.proto", 192 "//third_party/cros_system_api/dbus/power_manager/suspend.proto",
188 ] 193 ]
(...skipping 10 matching lines...) Expand all
199 proto_out_dir = "chromeos/dbus/cryptohome" 204 proto_out_dir = "chromeos/dbus/cryptohome"
200 } 205 }
201 206
202 proto_library("cryptohome_signkey_proto") { 207 proto_library("cryptohome_signkey_proto") {
203 sources = [ 208 sources = [
204 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", 209 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
205 ] 210 ]
206 211
207 proto_out_dir = "chromeos/cryptohome" 212 proto_out_dir = "chromeos/cryptohome"
208 } 213 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | testing/buildbot/gn_isolate_map.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698