Chromium Code Reviews| Index: blimp/client/BUILD.gn |
| diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn |
| index 9ff28e64fd30ede19da525729a8178a288191ae0..3c4edb08381081d871c5853f6148639f49e18556 100644 |
| --- a/blimp/client/BUILD.gn |
| +++ b/blimp/client/BUILD.gn |
| @@ -17,15 +17,12 @@ source_set("blimp_client") { |
| "app/blimp_discardable_memory_allocator.h", |
| "app/blimp_startup.cc", |
| "app/blimp_startup.h", |
| - "blimp_client_export.h", |
| "session/assignment_source.cc", |
| "session/assignment_source.h", |
| "session/blimp_client_session.cc", |
| "session/blimp_client_session.h", |
| ] |
| - defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] |
| - |
| public_deps = [ |
| "//components/safe_json", |
| "//components/url_formatter", |
| @@ -33,8 +30,10 @@ source_set("blimp_client") { |
| ] |
| deps = [ |
| + ":blimp_client_export", |
| ":feature", |
| "//base", |
| + "//blimp/common:blimp_common", |
|
brettw
2016/04/27 22:40:36
As a followup, this should be renamed just "//blim
nyquist
2016/04/27 23:13:37
Wow. Thanks! I'll definitely clean this up in a fo
|
| "//blimp/common/proto", |
| "//blimp/net:blimp_net", |
| "//cc", |
| @@ -43,10 +42,18 @@ source_set("blimp_client") { |
| "//net", |
| "//third_party/libwebp", |
| "//ui/gfx/geometry", |
| + "//ui/gl", |
| "//url:url", |
| ] |
| } |
| +source_set("blimp_client_export") { |
| + sources = [ |
| + "blimp_client_export.h", |
| + ] |
| + defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] |
|
brettw
2016/04/27 22:40:36
This define won't do anything since no sources are
nyquist
2016/04/27 23:13:37
Done.
|
| +} |
| + |
| source_set("blimp_client_unit_tests") { |
| testonly = true |
| @@ -57,6 +64,7 @@ source_set("blimp_client_unit_tests") { |
| "//base", |
| "//base/test:run_all_unittests", |
| "//base/test:test_support", |
| + "//blimp/common:blimp_common", |
| "//testing/gmock", |
| "//testing/gtest", |
| ] |
| @@ -125,16 +133,23 @@ source_set("feature") { |
| ] |
| deps = [ |
| + ":blimp_client_export", |
| "//blimp/common:blimp_common", |
| "//blimp/net:blimp_net", |
| "//cc", |
| "//cc/proto", |
| + "//components/url_formatter:url_formatter", |
|
brettw
2016/04/27 22:40:36
Just use "//components/url_formatter" (expands to
nyquist
2016/04/27 23:13:37
Done.
|
| "//gpu/command_buffer/client", |
| "//gpu/command_buffer/client:gl_in_process_context", |
| + "//gpu/command_buffer/client:gles2_c_lib", |
| + "//gpu/command_buffer/client:gles2_implementation", |
| "//gpu/command_buffer/common:gles2_utils", |
| "//gpu/skia_bindings", |
| + "//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", |
| "//ui/gl", |
| @@ -165,9 +180,13 @@ source_set("feature_unit_tests") { |
| "//blimp/net:blimp_net", |
| "//blimp/net:test_support", |
| "//cc/proto", |
| + "//net", |
| + "//net:test_support", |
| "//skia", |
| "//testing/gmock", |
| "//testing/gtest", |
| + "//ui/events:gesture_detection", |
| + "//ui/gfx/geometry", |
| ] |
| if (is_linux) { |
| @@ -193,6 +212,7 @@ if (is_linux && !is_chromeos && use_x11) { |
| "//blimp/net:blimp_net", |
| "//net", |
| "//ui/events/platform/x11", |
| + "//ui/platform_window", |
| "//ui/platform_window/x11", |
| ] |
| @@ -362,10 +382,12 @@ if (is_android) { |
| ":feature", |
| ":jni_headers", |
| "//base", |
| + "//blimp/common:blimp_common", |
| "//blimp/common/proto", |
| "//blimp/net:blimp_net", |
| "//components/safe_json/android:safe_json_jni_headers", |
| "//components/url_formatter", |
| + "//net", |
| "//skia", |
| "//ui/base/ime:text_input_types", |
| "//ui/gfx/geometry", |