| OLD | NEW |
| 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("//chrome/chrome_tests.gni") | 7 import("//chrome/chrome_tests.gni") |
| 8 import("//media/media_options.gni") | 8 import("//media/media_options.gni") |
| 9 import("//third_party/protobuf/proto_library.gni") | 9 import("//third_party/protobuf/proto_library.gni") |
| 10 | 10 |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 sources = rebase_path(gypi_values.browser_chromeos_sources, ".", "//chrome") + | 134 sources = rebase_path(gypi_values.browser_chromeos_sources, ".", "//chrome") + |
| 135 rebase_path(gypi_values.browser_chromeos_extension_sources, | 135 rebase_path(gypi_values.browser_chromeos_extension_sources, |
| 136 ".", | 136 ".", |
| 137 "//chrome") | 137 "//chrome") |
| 138 sources += [ | 138 sources += [ |
| 139 "chrome_interface_factory.cc", | 139 "chrome_interface_factory.cc", |
| 140 "chrome_interface_factory.h", | 140 "chrome_interface_factory.h", |
| 141 ] | 141 ] |
| 142 if (use_x11) { | 142 if (use_x11) { |
| 143 configs += [ "//build/config/linux:x11" ] | 143 configs += [ "//build/config/linux:x11" ] |
| 144 deps += [ "//ui/events/devices" ] | 144 deps += [ |
| 145 "//ui/events/devices", |
| 146 "//ui/events/devices/x11", |
| 147 ] |
| 145 sources -= [ | 148 sources -= [ |
| 146 "system/input_device_settings_impl_ozone.cc", | 149 "system/input_device_settings_impl_ozone.cc", |
| 147 "system_logs/touch_log_source_ozone.cc", | 150 "system_logs/touch_log_source_ozone.cc", |
| 148 ] | 151 ] |
| 149 } else { | 152 } else { |
| 150 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") | 153 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") |
| 151 deps += [ "//ui/ozone" ] | 154 deps += [ "//ui/ozone" ] |
| 152 sources -= [ | 155 sources -= [ |
| 153 "device_uma.cc", | 156 "device_uma.cc", |
| 154 "device_uma.h", | 157 "device_uma.h", |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 "policy/proto/install_attributes.proto", | 213 "policy/proto/install_attributes.proto", |
| 211 ] | 214 ] |
| 212 } | 215 } |
| 213 | 216 |
| 214 proto_library("attestation_proto") { | 217 proto_library("attestation_proto") { |
| 215 sources = [ | 218 sources = [ |
| 216 "attestation/attestation_key_payload.proto", | 219 "attestation/attestation_key_payload.proto", |
| 217 "attestation/attestation_signed_data.proto", | 220 "attestation/attestation_signed_data.proto", |
| 218 ] | 221 ] |
| 219 } | 222 } |
| OLD | NEW |