Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| 11 | 11 |
| 12 source_set("client") { | 12 source_set("session") { |
| 13 sources = [ | 13 sources = [ |
| 14 "app/blimp_client_switches.cc", | |
| 15 "app/blimp_client_switches.h", | |
| 16 "app/blimp_discardable_memory_allocator.cc", | |
| 17 "app/blimp_discardable_memory_allocator.h", | |
| 18 "app/blimp_startup.cc", | |
| 19 "app/blimp_startup.h", | |
| 20 "session/assignment_source.cc", | 14 "session/assignment_source.cc", |
| 21 "session/assignment_source.h", | 15 "session/assignment_source.h", |
| 22 "session/blimp_client_session.cc", | 16 "session/blimp_client_session.cc", |
| 23 "session/blimp_client_session.h", | 17 "session/blimp_client_session.h", |
| 24 ] | 18 ] |
| 25 | 19 |
| 26 public_deps = [ | 20 public_deps = [ |
| 21 "//components/safe_json", | |
| 22 "//ui/events", | |
| 23 ] | |
| 24 | |
| 25 deps = [ | |
| 26 ":feature", | |
|
Kevin M
2016/05/02 21:32:39
Why is this needed?
haibinlu
2016/05/03 19:32:42
blimp_client_session.cc has
#include "blimp/cli
Kevin M
2016/05/03 20:29:34
Acknowledged.
| |
| 27 ":switches", | |
| 28 "//base", | |
| 29 "//blimp/common", | |
| 30 "//blimp/common/proto", | |
| 31 "//blimp/net", | |
| 32 "//net", | |
| 33 "//ui/gfx/geometry", | |
| 34 "//url:url", | |
| 35 ] | |
| 36 } | |
| 37 | |
| 38 source_set("client") { | |
| 39 sources = [ | |
| 40 "app/blimp_discardable_memory_allocator.cc", | |
| 41 "app/blimp_discardable_memory_allocator.h", | |
| 42 "app/blimp_startup.cc", | |
| 43 "app/blimp_startup.h", | |
| 44 ] | |
| 45 | |
| 46 public_deps = [ | |
| 27 "//components/safe_json", | 47 "//components/safe_json", |
| 28 "//components/url_formatter", | 48 "//components/url_formatter", |
| 29 "//ui/events", | 49 "//ui/events", |
| 30 ] | 50 ] |
| 31 | 51 |
| 32 deps = [ | 52 deps = [ |
| 33 ":feature", | 53 ":feature", |
|
Kevin M
2016/05/02 21:32:39
Not needed
haibinlu
2016/05/03 19:32:43
Done.
| |
| 54 ":feature_compositor", | |
| 55 ":session", | |
| 56 ":switches", | |
| 34 "//base", | 57 "//base", |
| 35 "//blimp/common", | 58 "//blimp/common", |
| 36 "//blimp/common/proto", | 59 "//blimp/common/proto", |
| 37 "//blimp/net", | 60 "//blimp/net", |
| 38 "//cc", | 61 "//cc", |
| 39 "//gpu/command_buffer/client:gles2_implementation", | 62 "//gpu/command_buffer/client:gles2_implementation", |
| 40 "//gpu/skia_bindings", | 63 "//gpu/skia_bindings", |
| 41 "//net", | 64 "//net", |
| 42 "//third_party/libwebp", | 65 "//third_party/libwebp", |
| 43 "//ui/gfx/geometry", | 66 "//ui/gfx/geometry", |
| 44 "//ui/gl", | 67 "//ui/gl", |
| 45 "//url:url", | 68 "//url:url", |
| 46 ] | 69 ] |
| 47 } | 70 } |
| 48 | 71 |
| 72 source_set("switches") { | |
| 73 sources = [ | |
| 74 "app/blimp_client_switches.cc", | |
| 75 "app/blimp_client_switches.h", | |
| 76 ] | |
| 77 } | |
| 78 | |
| 49 source_set("blimp_client_unit_tests") { | 79 source_set("blimp_client_unit_tests") { |
| 50 testonly = true | 80 testonly = true |
| 51 | 81 |
| 52 sources = [] | 82 sources = [] |
| 53 | 83 |
| 54 deps = [ | 84 deps = [ |
| 55 ":client", | 85 ":client", |
| 86 ":session", | |
| 87 ":switches", | |
| 56 "//base", | 88 "//base", |
| 57 "//base/test:run_all_unittests", | 89 "//base/test:run_all_unittests", |
| 58 "//base/test:test_support", | 90 "//base/test:test_support", |
| 59 "//blimp/common", | 91 "//blimp/common", |
| 60 "//testing/gmock", | 92 "//testing/gmock", |
| 61 "//testing/gtest", | 93 "//testing/gtest", |
| 62 ] | 94 ] |
| 63 | 95 |
| 64 data = [] | 96 data = [] |
| 65 | 97 |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 87 "//base", | 119 "//base", |
| 88 "//base/test:run_all_unittests", | 120 "//base/test:run_all_unittests", |
| 89 "//base/test:test_support", | 121 "//base/test:test_support", |
| 90 "//testing/gmock", | 122 "//testing/gmock", |
| 91 "//testing/gtest", | 123 "//testing/gtest", |
| 92 ] | 124 ] |
| 93 } | 125 } |
| 94 | 126 |
| 95 source_set("feature") { | 127 source_set("feature") { |
| 96 sources = [ | 128 sources = [ |
| 129 "feature/ime_feature.cc", | |
| 130 "feature/ime_feature.h", | |
| 131 "feature/navigation_feature.cc", | |
| 132 "feature/navigation_feature.h", | |
| 133 "feature/render_widget_feature.cc", | |
| 134 "feature/render_widget_feature.h", | |
| 135 "feature/settings_feature.cc", | |
| 136 "feature/settings_feature.h", | |
| 137 "feature/tab_control_feature.cc", | |
| 138 "feature/tab_control_feature.h", | |
| 139 ] | |
| 140 | |
| 141 deps = [ | |
| 142 "//base:base", | |
| 143 "//blimp/common", | |
| 144 "//blimp/net", | |
| 145 "//cc", | |
| 146 "//cc/proto", | |
| 147 "//components/url_formatter", | |
| 148 "//net:net", | |
| 149 "//skia", | |
| 150 "//ui/base/ime:text_input_types", | |
| 151 "//ui/gfx/geometry:geometry", | |
| 152 ] | |
| 153 | |
| 154 public_deps = [ | |
| 155 "//blimp/common/proto", | |
| 156 ] | |
| 157 } | |
| 158 | |
| 159 source_set("feature_compositor") { | |
|
Kevin M
2016/05/02 21:32:39
Why this name? Is this a capital-F Feature in the
haibinlu
2016/05/03 19:32:42
Tommy suggested the name.
What is the gn naming
Kevin M
2016/05/03 20:29:34
It's not that it's a bad name for GN, I just think
haibinlu
2016/05/03 20:51:59
Done.
| |
| 160 sources = [ | |
| 97 "feature/compositor/blimp_compositor.cc", | 161 "feature/compositor/blimp_compositor.cc", |
| 98 "feature/compositor/blimp_compositor.h", | 162 "feature/compositor/blimp_compositor.h", |
| 99 "feature/compositor/blimp_compositor_manager.cc", | 163 "feature/compositor/blimp_compositor_manager.cc", |
| 100 "feature/compositor/blimp_compositor_manager.h", | 164 "feature/compositor/blimp_compositor_manager.h", |
| 101 "feature/compositor/blimp_context_provider.cc", | 165 "feature/compositor/blimp_context_provider.cc", |
| 102 "feature/compositor/blimp_context_provider.h", | 166 "feature/compositor/blimp_context_provider.h", |
| 103 "feature/compositor/blimp_gpu_memory_buffer_manager.cc", | 167 "feature/compositor/blimp_gpu_memory_buffer_manager.cc", |
| 104 "feature/compositor/blimp_gpu_memory_buffer_manager.h", | 168 "feature/compositor/blimp_gpu_memory_buffer_manager.h", |
| 105 "feature/compositor/blimp_input_handler_wrapper.cc", | 169 "feature/compositor/blimp_input_handler_wrapper.cc", |
| 106 "feature/compositor/blimp_input_handler_wrapper.h", | 170 "feature/compositor/blimp_input_handler_wrapper.h", |
| 107 "feature/compositor/blimp_input_manager.cc", | 171 "feature/compositor/blimp_input_manager.cc", |
| 108 "feature/compositor/blimp_input_manager.h", | 172 "feature/compositor/blimp_input_manager.h", |
| 109 "feature/compositor/blimp_layer_tree_settings.cc", | 173 "feature/compositor/blimp_layer_tree_settings.cc", |
| 110 "feature/compositor/blimp_layer_tree_settings.h", | 174 "feature/compositor/blimp_layer_tree_settings.h", |
| 111 "feature/compositor/blimp_output_surface.cc", | 175 "feature/compositor/blimp_output_surface.cc", |
| 112 "feature/compositor/blimp_output_surface.h", | 176 "feature/compositor/blimp_output_surface.h", |
| 113 "feature/compositor/decoding_image_generator.cc", | 177 "feature/compositor/decoding_image_generator.cc", |
| 114 "feature/compositor/decoding_image_generator.h", | 178 "feature/compositor/decoding_image_generator.h", |
| 115 "feature/ime_feature.cc", | |
| 116 "feature/ime_feature.h", | |
| 117 "feature/navigation_feature.cc", | |
| 118 "feature/navigation_feature.h", | |
| 119 "feature/render_widget_feature.cc", | |
| 120 "feature/render_widget_feature.h", | |
| 121 "feature/settings_feature.cc", | |
| 122 "feature/settings_feature.h", | |
| 123 "feature/tab_control_feature.cc", | |
| 124 "feature/tab_control_feature.h", | |
| 125 ] | 179 ] |
| 126 | 180 |
| 127 deps = [ | 181 deps = [ |
| 182 ":feature", | |
| 128 "//blimp/common", | 183 "//blimp/common", |
| 129 "//blimp/net", | 184 "//blimp/net", |
| 130 "//cc", | 185 "//cc", |
| 131 "//cc/proto", | 186 "//cc/proto", |
| 132 "//components/url_formatter", | |
| 133 "//gpu/command_buffer/client", | 187 "//gpu/command_buffer/client", |
| 134 "//gpu/command_buffer/client:gl_in_process_context", | 188 "//gpu/command_buffer/client:gl_in_process_context", |
| 135 "//gpu/command_buffer/client:gles2_c_lib", | 189 "//gpu/command_buffer/client:gles2_c_lib", |
| 136 "//gpu/command_buffer/client:gles2_implementation", | 190 "//gpu/command_buffer/client:gles2_implementation", |
| 137 "//gpu/command_buffer/common:gles2_utils", | 191 "//gpu/command_buffer/common:gles2_utils", |
| 138 "//gpu/skia_bindings", | 192 "//gpu/skia_bindings", |
| 139 "//net", | 193 "//net", |
| 140 "//skia", | 194 "//skia", |
| 141 "//third_party/WebKit/public:blink_headers", | 195 "//third_party/WebKit/public:blink_headers", |
| 142 "//ui/base/ime:text_input_types", | |
| 143 "//ui/events:gesture_detection", | 196 "//ui/events:gesture_detection", |
| 144 "//ui/events/blink", | 197 "//ui/events/blink", |
| 145 "//ui/events/gestures/blink", | 198 "//ui/events/gestures/blink", |
| 146 "//ui/gl", | 199 "//ui/gl", |
| 147 ] | 200 ] |
| 148 | 201 |
| 149 public_deps = [ | 202 public_deps = [ |
| 150 "//blimp/common/proto", | 203 "//blimp/common/proto", |
| 151 ] | 204 ] |
| 152 } | 205 } |
| 153 | 206 |
| 154 source_set("feature_unit_tests") { | 207 source_set("feature_unit_tests") { |
| 155 testonly = true | 208 testonly = true |
| 156 | 209 |
| 157 sources = [ | 210 sources = [ |
| 158 "feature/compositor/blimp_compositor_manager_unittest.cc", | 211 "feature/compositor/blimp_compositor_manager_unittest.cc", |
| 159 "feature/navigation_feature_unittest.cc", | 212 "feature/navigation_feature_unittest.cc", |
| 160 "feature/render_widget_feature_unittest.cc", | 213 "feature/render_widget_feature_unittest.cc", |
| 161 "feature/tab_control_feature_unittest.cc", | 214 "feature/tab_control_feature_unittest.cc", |
| 162 ] | 215 ] |
| 163 | 216 |
| 164 deps = [ | 217 deps = [ |
| 165 ":feature", | 218 ":feature", |
|
Kevin M
2016/05/02 21:32:39
Already pulled in indirectly by feature_compositor
haibinlu
2016/05/03 19:32:43
Done.
| |
| 219 ":feature_compositor", | |
| 166 "//base", | 220 "//base", |
| 167 "//base/test:run_all_unittests", | 221 "//base/test:run_all_unittests", |
| 168 "//base/test:test_support", | 222 "//base/test:test_support", |
| 169 "//blimp/common", | 223 "//blimp/common", |
| 170 "//blimp/common/proto", | 224 "//blimp/common/proto", |
| 171 "//blimp/net", | 225 "//blimp/net", |
| 172 "//blimp/net:test_support", | 226 "//blimp/net:test_support", |
| 173 "//cc/proto", | 227 "//cc/proto", |
| 174 "//net", | 228 "//net", |
| 175 "//net:test_support", | 229 "//net:test_support", |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 192 "app/linux/blimp_client_session_linux.cc", | 246 "app/linux/blimp_client_session_linux.cc", |
| 193 "app/linux/blimp_client_session_linux.h", | 247 "app/linux/blimp_client_session_linux.h", |
| 194 "app/linux/blimp_display_manager.cc", | 248 "app/linux/blimp_display_manager.cc", |
| 195 "app/linux/blimp_display_manager.h", | 249 "app/linux/blimp_display_manager.h", |
| 196 "app/linux/blimp_main.cc", | 250 "app/linux/blimp_main.cc", |
| 197 ] | 251 ] |
| 198 | 252 |
| 199 deps = [ | 253 deps = [ |
| 200 ":client", | 254 ":client", |
| 201 ":feature", | 255 ":feature", |
| 256 ":feature_compositor", | |
| 202 "//base", | 257 "//base", |
| 203 "//blimp/net", | 258 "//blimp/net", |
| 204 "//net", | 259 "//net", |
| 205 "//ui/events/platform/x11", | 260 "//ui/events/platform/x11", |
| 206 "//ui/platform_window", | 261 "//ui/platform_window", |
| 207 "//ui/platform_window/x11", | 262 "//ui/platform_window/x11", |
| 208 ] | 263 ] |
| 209 | 264 |
| 210 public_configs = [ "//build/config/linux:x11" ] | 265 public_configs = [ "//build/config/linux:x11" ] |
| 211 public_deps = [ | 266 public_deps = [ |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 363 | 418 |
| 364 java_files = [ | 419 java_files = [ |
| 365 "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java", | 420 "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java", |
| 366 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java", | 421 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest .java", |
| 367 ] | 422 ] |
| 368 } | 423 } |
| 369 | 424 |
| 370 shared_library("blimp_client_android") { | 425 shared_library("blimp_client_android") { |
| 371 deps = [ | 426 deps = [ |
| 372 ":client", | 427 ":client", |
| 373 ":feature", | 428 ":feature", |
|
Kevin M
2016/05/02 21:32:39
Not needed
haibinlu
2016/05/03 19:32:42
Done.
| |
| 429 ":feature_compositor", | |
| 374 ":jni_headers", | 430 ":jni_headers", |
| 375 "//base", | 431 "//base", |
| 376 "//blimp/common", | 432 "//blimp/common", |
| 377 "//blimp/common/proto", | 433 "//blimp/common/proto", |
| 378 "//blimp/net", | 434 "//blimp/net", |
| 379 "//components/safe_json/android:safe_json_jni_headers", | 435 "//components/safe_json/android:safe_json_jni_headers", |
| 380 "//components/url_formatter", | 436 "//components/url_formatter", |
| 381 "//net", | 437 "//net", |
| 382 "//skia", | 438 "//skia", |
| 383 "//ui/base/ime:text_input_types", | 439 "//ui/base/ime:text_input_types", |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 430 apk_name = "BlimpTest" | 486 apk_name = "BlimpTest" |
| 431 apk_under_test = ":blimp_apk" | 487 apk_under_test = ":blimp_apk" |
| 432 android_manifest = blimp_test_apk_manifest | 488 android_manifest = blimp_test_apk_manifest |
| 433 deps = [ | 489 deps = [ |
| 434 ":blimp_test_apk_manifest", | 490 ":blimp_test_apk_manifest", |
| 435 ":blimp_test_java", | 491 ":blimp_test_java", |
| 436 google_play_services_resources, | 492 google_play_services_resources, |
| 437 ] | 493 ] |
| 438 } | 494 } |
| 439 } | 495 } |
| OLD | NEW |