| 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/ui.gni") |    5 import("//build/config/ui.gni") | 
|    6 import("//ui/ozone/ozone.gni") |    6 import("//ui/ozone/ozone.gni") | 
|    7 import("//testing/test.gni") |    7 import("//testing/test.gni") | 
|    8  |    8  | 
|    9 assert(use_ozone) |    9 assert(use_ozone) | 
|   10  |   10  | 
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  115     "//ui/display/types", |  115     "//ui/display/types", | 
|  116     "//ui/display/util", |  116     "//ui/display/util", | 
|  117     "//ui/events", |  117     "//ui/events", | 
|  118     "//ui/events:dom_keycode_converter", |  118     "//ui/events:dom_keycode_converter", | 
|  119     "//ui/gfx", |  119     "//ui/gfx", | 
|  120     "//ui/gfx/geometry", |  120     "//ui/gfx/geometry", | 
|  121     "//ui/gfx/ipc", |  121     "//ui/gfx/ipc", | 
|  122   ] |  122   ] | 
|  123 } |  123 } | 
|  124  |  124  | 
|  125 component("ozone") { |  125 source_set("platform") { | 
|  126   sources = [ |  126   sources = [ | 
|  127     "common/stub_client_native_pixmap_factory.cc", |  127     "common/stub_client_native_pixmap_factory.cc", | 
|  128     "common/stub_client_native_pixmap_factory.h", |  128     "common/stub_client_native_pixmap_factory.h", | 
|  129     "platform_selection.cc", |  129     "platform_selection.cc", | 
|  130     "platform_selection.h", |  130     "platform_selection.h", | 
|  131     "public/client_native_pixmap_factory.cc", |  131     "public/client_native_pixmap_factory.cc", | 
|  132     "public/client_native_pixmap_factory.h", |  132     "public/client_native_pixmap_factory.h", | 
|  133     "public/ozone_gpu_test_helper.cc", |  133     "public/ozone_gpu_test_helper.cc", | 
|  134     "public/ozone_gpu_test_helper.h", |  134     "public/ozone_gpu_test_helper.h", | 
|  135     "public/ozone_platform.cc", |  135     "public/ozone_platform.cc", | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
|  154     "//ui/platform_window", |  154     "//ui/platform_window", | 
|  155   ] |  155   ] | 
|  156  |  156  | 
|  157   deps = [ |  157   deps = [ | 
|  158     ":generate_constructor_list", |  158     ":generate_constructor_list", | 
|  159     ":generate_ozone_platform_list", |  159     ":generate_ozone_platform_list", | 
|  160   ] |  160   ] | 
|  161  |  161  | 
|  162   # TODO(GYP) the GYP version has a way to add additional dependencies via |  162   # TODO(GYP) the GYP version has a way to add additional dependencies via | 
|  163   # build flags. |  163   # build flags. | 
|  164   public_deps += ozone_platform_deps |  164   deps += ozone_platform_deps | 
|  165  |  165  | 
|  166   # Platforms are always linked into //ui/ozone and can include our headers. |  166   # Platforms are always linked into //ui/ozone and can include our headers. | 
|  167   allow_circular_includes_from = ozone_platform_deps |  167   allow_circular_includes_from = ozone_platform_deps | 
|  168 } |  168 } | 
|  169  |  169  | 
 |  170 component("ozone") { | 
 |  171   public_deps = [ | 
 |  172     ":platform", | 
 |  173   ] | 
 |  174 } | 
 |  175  | 
|  170 # GYP version: ui/ozone/ozone.gyp:generate_ozone_platform_list |  176 # GYP version: ui/ozone/ozone.gyp:generate_ozone_platform_list | 
|  171 action("generate_ozone_platform_list") { |  177 action("generate_ozone_platform_list") { | 
|  172   script = "generate_ozone_platform_list.py" |  178   script = "generate_ozone_platform_list.py" | 
|  173   outputs = [ |  179   outputs = [ | 
|  174     platform_list_cc_file, |  180     platform_list_cc_file, | 
|  175     platform_list_h_file, |  181     platform_list_h_file, | 
|  176     platform_list_txt_file, |  182     platform_list_txt_file, | 
|  177   ] |  183   ] | 
|  178  |  184  | 
|  179   args = |  185   args = | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
|  210     ":generate_ozone_platform_list", |  216     ":generate_ozone_platform_list", | 
|  211   ] |  217   ] | 
|  212 } |  218 } | 
|  213  |  219  | 
|  214 test("ozone_unittests") { |  220 test("ozone_unittests") { | 
|  215   sources = [ |  221   sources = [ | 
|  216     "run_all_unittests.cc", |  222     "run_all_unittests.cc", | 
|  217   ] |  223   ] | 
|  218  |  224  | 
|  219   deps = [ |  225   deps = [ | 
|  220            "//base/test:test_support", |  226     "//base/test:test_support", | 
|  221            "//testing/gtest", |  227     "//testing/gtest", | 
|  222            "//ui/gfx/geometry", |  228     "//ui/gfx/geometry", | 
|  223          ] + ozone_platform_test_deps |  229   ] | 
 |  230  | 
 |  231   # Add tests of platform internals. | 
 |  232   deps += ozone_platform_test_deps | 
 |  233  | 
 |  234   # Platform tests link ozone statically. Make sure we're not getting a | 
 |  235   # 2nd copy of any code via the component. | 
 |  236   assert_no_deps = [ "//ui/ozone" ] | 
|  224 } |  237 } | 
| OLD | NEW |