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

Side by Side Diff: chromeos/BUILD.gn

Issue 2038083003: 💫 target_cpu -> current_cpu in chromeos/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@monochrome
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 | « no previous file | no next file » | 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 29 matching lines...) Expand all
40 "//crypto:platform", 40 "//crypto:platform",
41 "//google_apis", 41 "//google_apis",
42 "//net", 42 "//net",
43 "//third_party/icu", 43 "//third_party/icu",
44 "//third_party/libxml", 44 "//third_party/libxml",
45 "//third_party/protobuf:protobuf_lite", 45 "//third_party/protobuf:protobuf_lite",
46 "//url", 46 "//url",
47 ] 47 ]
48 sources = gypi_values.chromeos_sources 48 sources = gypi_values.chromeos_sources
49 defines = [ "CHROMEOS_IMPLEMENTATION" ] 49 defines = [ "CHROMEOS_IMPLEMENTATION" ]
50 if (target_cpu == "arm" || target_cpu == "x86") { 50 if (current_cpu == "arm" || current_cpu == "x86") {
oshima 2016/06/03 19:04:31 I'm not sure if this is the right thing. defer to
51 defines += [ "BINDER_IPC_32BIT" ] 51 defines += [ "BINDER_IPC_32BIT" ]
52 } 52 }
53 } 53 }
54 54
55 # TYhis must be a static library instead of a source set because some of the 55 # TYhis must be a static library instead of a source set because some of the
56 # files pull in things with dependencies that aren't linked in all cases. 56 # files pull in things with dependencies that aren't linked in all cases.
57 # 57 #
58 # TODO this should probably be changed such that it links in all cases and 58 # TODO this should probably be changed such that it links in all cases and
59 # can be converted to a source set. 59 # can be converted to a source set.
60 static_library("test_support") { 60 static_library("test_support") {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 "//google_apis", 164 "//google_apis",
165 "//net", 165 "//net",
166 "//net:test_support", 166 "//net:test_support",
167 "//testing/gmock", 167 "//testing/gmock",
168 "//testing/gtest", 168 "//testing/gtest",
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 (current_cpu == "arm" || current_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 } 179 }
180 180
181 proto_library("power_manager_proto") { 181 proto_library("power_manager_proto") {
182 sources = [ 182 sources = [
183 "//third_party/cros_system_api/dbus/power_manager/input_event.proto", 183 "//third_party/cros_system_api/dbus/power_manager/input_event.proto",
184 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status. proto", 184 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status. proto",
(...skipping 14 matching lines...) Expand all
199 proto_out_dir = "chromeos/dbus/cryptohome" 199 proto_out_dir = "chromeos/dbus/cryptohome"
200 } 200 }
201 201
202 proto_library("cryptohome_signkey_proto") { 202 proto_library("cryptohome_signkey_proto") {
203 sources = [ 203 sources = [
204 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", 204 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
205 ] 205 ]
206 206
207 proto_out_dir = "chromeos/cryptohome" 207 proto_out_dir = "chromeos/cryptohome"
208 } 208 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698