Chromium Code Reviews| Index: blimp/client/BUILD.gn |
| diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn |
| index 9f59d259cd4c06ba2819db554f6804d5f2056d5c..0f38c035571e7413e68b26de0d593de936bb38ec 100644 |
| --- a/blimp/client/BUILD.gn |
| +++ b/blimp/client/BUILD.gn |
| @@ -9,18 +9,38 @@ if (is_android) { |
| import("//build/config/android/rules.gni") |
| } |
| +source_set("session") { |
| + sources = [ |
| + "session/assignment_source.cc", |
| + "session/assignment_source.h", |
| + "session/blimp_client_session.cc", |
| + "session/blimp_client_session.h", |
| + ] |
| + |
| + public_deps = [ |
| + "//components/safe_json", |
| + "//ui/events", |
| + ] |
| + |
| + deps = [ |
| + ":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.
|
| + ":switches", |
| + "//base", |
| + "//blimp/common", |
| + "//blimp/common/proto", |
| + "//blimp/net", |
| + "//net", |
| + "//ui/gfx/geometry", |
| + "//url:url", |
| + ] |
| +} |
| + |
| source_set("client") { |
| sources = [ |
| - "app/blimp_client_switches.cc", |
| - "app/blimp_client_switches.h", |
| "app/blimp_discardable_memory_allocator.cc", |
| "app/blimp_discardable_memory_allocator.h", |
| "app/blimp_startup.cc", |
| "app/blimp_startup.h", |
| - "session/assignment_source.cc", |
| - "session/assignment_source.h", |
| - "session/blimp_client_session.cc", |
| - "session/blimp_client_session.h", |
| ] |
| public_deps = [ |
| @@ -31,6 +51,9 @@ source_set("client") { |
| deps = [ |
| ":feature", |
|
Kevin M
2016/05/02 21:32:39
Not needed
haibinlu
2016/05/03 19:32:43
Done.
|
| + ":feature_compositor", |
| + ":session", |
| + ":switches", |
| "//base", |
| "//blimp/common", |
| "//blimp/common/proto", |
| @@ -46,6 +69,13 @@ source_set("client") { |
| ] |
| } |
| +source_set("switches") { |
| + sources = [ |
| + "app/blimp_client_switches.cc", |
| + "app/blimp_client_switches.h", |
| + ] |
| +} |
| + |
| source_set("blimp_client_unit_tests") { |
| testonly = true |
| @@ -53,6 +83,8 @@ source_set("blimp_client_unit_tests") { |
| deps = [ |
| ":client", |
| + ":session", |
| + ":switches", |
| "//base", |
| "//base/test:run_all_unittests", |
| "//base/test:test_support", |
| @@ -94,6 +126,38 @@ source_set("app_unit_tests") { |
| source_set("feature") { |
| sources = [ |
| + "feature/ime_feature.cc", |
| + "feature/ime_feature.h", |
| + "feature/navigation_feature.cc", |
| + "feature/navigation_feature.h", |
| + "feature/render_widget_feature.cc", |
| + "feature/render_widget_feature.h", |
| + "feature/settings_feature.cc", |
| + "feature/settings_feature.h", |
| + "feature/tab_control_feature.cc", |
| + "feature/tab_control_feature.h", |
| + ] |
| + |
| + deps = [ |
| + "//base:base", |
| + "//blimp/common", |
| + "//blimp/net", |
| + "//cc", |
| + "//cc/proto", |
| + "//components/url_formatter", |
| + "//net:net", |
| + "//skia", |
| + "//ui/base/ime:text_input_types", |
| + "//ui/gfx/geometry:geometry", |
| + ] |
| + |
| + public_deps = [ |
| + "//blimp/common/proto", |
| + ] |
| +} |
| + |
| +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.
|
| + sources = [ |
| "feature/compositor/blimp_compositor.cc", |
| "feature/compositor/blimp_compositor.h", |
| "feature/compositor/blimp_compositor_manager.cc", |
| @@ -112,24 +176,14 @@ source_set("feature") { |
| "feature/compositor/blimp_output_surface.h", |
| "feature/compositor/decoding_image_generator.cc", |
| "feature/compositor/decoding_image_generator.h", |
| - "feature/ime_feature.cc", |
| - "feature/ime_feature.h", |
| - "feature/navigation_feature.cc", |
| - "feature/navigation_feature.h", |
| - "feature/render_widget_feature.cc", |
| - "feature/render_widget_feature.h", |
| - "feature/settings_feature.cc", |
| - "feature/settings_feature.h", |
| - "feature/tab_control_feature.cc", |
| - "feature/tab_control_feature.h", |
| ] |
| deps = [ |
| + ":feature", |
| "//blimp/common", |
| "//blimp/net", |
| "//cc", |
| "//cc/proto", |
| - "//components/url_formatter", |
| "//gpu/command_buffer/client", |
| "//gpu/command_buffer/client:gl_in_process_context", |
| "//gpu/command_buffer/client:gles2_c_lib", |
| @@ -139,7 +193,6 @@ source_set("feature") { |
| "//net", |
| "//skia", |
| "//third_party/WebKit/public:blink_headers", |
| - "//ui/base/ime:text_input_types", |
| "//ui/events:gesture_detection", |
| "//ui/events/blink", |
| "//ui/events/gestures/blink", |
| @@ -163,6 +216,7 @@ source_set("feature_unit_tests") { |
| deps = [ |
| ":feature", |
|
Kevin M
2016/05/02 21:32:39
Already pulled in indirectly by feature_compositor
haibinlu
2016/05/03 19:32:43
Done.
|
| + ":feature_compositor", |
| "//base", |
| "//base/test:run_all_unittests", |
| "//base/test:test_support", |
| @@ -199,6 +253,7 @@ if (is_linux && !is_chromeos && use_x11) { |
| deps = [ |
| ":client", |
| ":feature", |
| + ":feature_compositor", |
| "//base", |
| "//blimp/net", |
| "//net", |
| @@ -371,6 +426,7 @@ if (is_android) { |
| deps = [ |
| ":client", |
| ":feature", |
|
Kevin M
2016/05/02 21:32:39
Not needed
haibinlu
2016/05/03 19:32:42
Done.
|
| + ":feature_compositor", |
| ":jni_headers", |
| "//base", |
| "//blimp/common", |