| 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("//components/nacl/nacl_defines.gni") |    7 import("//components/nacl/nacl_defines.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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  132   } else { |  132   } else { | 
|  133     sources += rebase_path( |  133     sources += rebase_path( | 
|  134         gypi_values.browser_chromeos_non_athena_sources, |  134         gypi_values.browser_chromeos_non_athena_sources, | 
|  135         ".", "//chrome") + |  135         ".", "//chrome") + | 
|  136         rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources, |  136         rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources, | 
|  137                     ".", "//chrome") |  137                     ".", "//chrome") | 
|  138   } |  138   } | 
|  139  |  139  | 
|  140   if (use_x11) { |  140   if (use_x11) { | 
|  141     configs += [ "//build/config/linux:x11" ] |  141     configs += [ "//build/config/linux:x11" ] | 
 |  142     deps += [ "//ui/events/devices" ] | 
|  142   } else { |  143   } else { | 
|  143     assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") |  144     assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") | 
|  144     deps += [ "//ui/ozone" ] |  145     deps += [ "//ui/ozone" ] | 
|  145     sources -= [ |  146     sources -= [ | 
|  146       "device_uma.cc", |  147       "device_uma.cc", | 
|  147       "device_uma.h", |  148       "device_uma.h", | 
|  148       "events/system_key_event_listener.cc", |  149       "events/system_key_event_listener.cc", | 
|  149       "events/system_key_event_listener.h", |  150       "events/system_key_event_listener.h", | 
|  150       "events/xinput_hierarchy_changed_event_listener.cc", |  151       "events/xinput_hierarchy_changed_event_listener.cc", | 
|  151       "events/xinput_hierarchy_changed_event_listener.h", |  152       "events/xinput_hierarchy_changed_event_listener.h", | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
|  171     "policy/proto/install_attributes.proto", |  172     "policy/proto/install_attributes.proto", | 
|  172   ] |  173   ] | 
|  173 } |  174 } | 
|  174  |  175  | 
|  175 proto_library("attestation_proto") { |  176 proto_library("attestation_proto") { | 
|  176   sources = [ |  177   sources = [ | 
|  177     "attestation/attestation_key_payload.proto", |  178     "attestation/attestation_key_payload.proto", | 
|  178     "attestation/attestation_signed_data.proto", |  179     "attestation/attestation_signed_data.proto", | 
|  179   ] |  180   ] | 
|  180 } |  181 } | 
| OLD | NEW |