| 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("//content/common/common.gni") |    7 import("//content/common/common.gni") | 
|    8 import("//mojo/public/tools/bindings/mojom.gni") |    8 import("//mojo/public/tools/bindings/mojom.gni") | 
|    9  |    9  | 
|   10 source_set("common") { |   10 source_set("common") { | 
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  156     ] |  156     ] | 
|  157     include_dirs += [ "//third_party/khronos" ] |  157     include_dirs += [ "//third_party/khronos" ] | 
|  158     configs += [ "//build/config/linux:xcomposite" ] |  158     configs += [ "//build/config/linux:xcomposite" ] | 
|  159  |  159  | 
|  160     if (cpu_arch != "arm" || !is_chromeos) { |  160     if (cpu_arch != "arm" || !is_chromeos) { | 
|  161       sources +=[ |  161       sources +=[ | 
|  162         "gpu/x_util.cc", |  162         "gpu/x_util.cc", | 
|  163         "gpu/x_util.h", |  163         "gpu/x_util.h", | 
|  164       ] |  164       ] | 
|  165     } |  165     } | 
 |  166   } else { | 
 |  167     sources -= [ | 
 |  168       "gpu/gpu_memory_buffer_factory_x11.cc", | 
 |  169     ] | 
|  166   } |  170   } | 
|  167  |  171  | 
|  168   if (enable_plugins) { |  172   if (enable_plugins) { | 
|  169     deps += [ |  173     deps += [ | 
|  170       "//ppapi:ppapi_shared", |  174       "//ppapi:ppapi_shared", | 
|  171     ] |  175     ] | 
|  172   } else { |  176   } else { | 
|  173     sources -= [ |  177     sources -= [ | 
|  174       "pepper_plugin_list.cc", |  178       "pepper_plugin_list.cc", | 
|  175       "pepper_plugin_list.h", |  179       "pepper_plugin_list.h", | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  268  |  272  | 
|  269 mojom("mojo_bindings") { |  273 mojom("mojo_bindings") { | 
|  270   sources = [ |  274   sources = [ | 
|  271     "render_frame_setup.mojom", |  275     "render_frame_setup.mojom", | 
|  272   ] |  276   ] | 
|  273  |  277  | 
|  274   deps = [ |  278   deps = [ | 
|  275     "//mojo/public/interfaces/service_provider:service_provider", |  279     "//mojo/public/interfaces/service_provider:service_provider", | 
|  276   ] |  280   ] | 
|  277 } |  281 } | 
| OLD | NEW |