| 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("blimp_client") { | 12 source_set("blimp_client") { |
| 13 sources = [ | 13 sources = [ |
| 14 "app/blimp_client_switches.cc", | 14 "app/blimp_client_switches.cc", |
| 15 "app/blimp_client_switches.h", | 15 "app/blimp_client_switches.h", |
| 16 "app/blimp_discardable_memory_allocator.cc", | 16 "app/blimp_discardable_memory_allocator.cc", |
| 17 "app/blimp_discardable_memory_allocator.h", | 17 "app/blimp_discardable_memory_allocator.h", |
| 18 "app/blimp_startup.cc", | 18 "app/blimp_startup.cc", |
| 19 "app/blimp_startup.h", | 19 "app/blimp_startup.h", |
| 20 "blimp_client_export.h", | |
| 21 "session/assignment_source.cc", | 20 "session/assignment_source.cc", |
| 22 "session/assignment_source.h", | 21 "session/assignment_source.h", |
| 23 "session/blimp_client_session.cc", | 22 "session/blimp_client_session.cc", |
| 24 "session/blimp_client_session.h", | 23 "session/blimp_client_session.h", |
| 25 ] | 24 ] |
| 26 | 25 |
| 27 defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ] | |
| 28 | |
| 29 public_deps = [ | 26 public_deps = [ |
| 30 "//components/safe_json", | 27 "//components/safe_json", |
| 31 "//components/url_formatter", | 28 "//components/url_formatter", |
| 32 "//ui/events", | 29 "//ui/events", |
| 33 ] | 30 ] |
| 34 | 31 |
| 35 deps = [ | 32 deps = [ |
| 36 ":feature", | 33 ":feature", |
| 37 "//base", | 34 "//base", |
| 35 "//blimp/common:blimp_common", |
| 38 "//blimp/common/proto", | 36 "//blimp/common/proto", |
| 39 "//blimp/net:blimp_net", | 37 "//blimp/net:blimp_net", |
| 40 "//cc", | 38 "//cc", |
| 41 "//gpu/command_buffer/client:gles2_implementation", | 39 "//gpu/command_buffer/client:gles2_implementation", |
| 42 "//gpu/skia_bindings", | 40 "//gpu/skia_bindings", |
| 43 "//net", | 41 "//net", |
| 44 "//third_party/libwebp", | 42 "//third_party/libwebp", |
| 45 "//ui/gfx/geometry", | 43 "//ui/gfx/geometry", |
| 44 "//ui/gl", |
| 46 "//url:url", | 45 "//url:url", |
| 47 ] | 46 ] |
| 48 } | 47 } |
| 49 | 48 |
| 50 source_set("blimp_client_unit_tests") { | 49 source_set("blimp_client_unit_tests") { |
| 51 testonly = true | 50 testonly = true |
| 52 | 51 |
| 53 sources = [] | 52 sources = [] |
| 54 | 53 |
| 55 deps = [ | 54 deps = [ |
| 56 ":blimp_client", | 55 ":blimp_client", |
| 57 "//base", | 56 "//base", |
| 58 "//base/test:run_all_unittests", | 57 "//base/test:run_all_unittests", |
| 59 "//base/test:test_support", | 58 "//base/test:test_support", |
| 59 "//blimp/common:blimp_common", |
| 60 "//testing/gmock", | 60 "//testing/gmock", |
| 61 "//testing/gtest", | 61 "//testing/gtest", |
| 62 ] | 62 ] |
| 63 | 63 |
| 64 data = [] | 64 data = [] |
| 65 | 65 |
| 66 # TODO(dtrainor): Fix the test harness to allow this to run on Android. | 66 # TODO(dtrainor): Fix the test harness to allow this to run on Android. |
| 67 # See crbug.com/588240. | 67 # See crbug.com/588240. |
| 68 if (is_linux) { | 68 if (is_linux) { |
| 69 sources += [ "session/assignment_source_unittest.cc" ] | 69 sources += [ "session/assignment_source_unittest.cc" ] |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 "feature/settings_feature.h", | 122 "feature/settings_feature.h", |
| 123 "feature/tab_control_feature.cc", | 123 "feature/tab_control_feature.cc", |
| 124 "feature/tab_control_feature.h", | 124 "feature/tab_control_feature.h", |
| 125 ] | 125 ] |
| 126 | 126 |
| 127 deps = [ | 127 deps = [ |
| 128 "//blimp/common:blimp_common", | 128 "//blimp/common:blimp_common", |
| 129 "//blimp/net:blimp_net", | 129 "//blimp/net:blimp_net", |
| 130 "//cc", | 130 "//cc", |
| 131 "//cc/proto", | 131 "//cc/proto", |
| 132 "//components/url_formatter", |
| 132 "//gpu/command_buffer/client", | 133 "//gpu/command_buffer/client", |
| 133 "//gpu/command_buffer/client:gl_in_process_context", | 134 "//gpu/command_buffer/client:gl_in_process_context", |
| 135 "//gpu/command_buffer/client:gles2_c_lib", |
| 136 "//gpu/command_buffer/client:gles2_implementation", |
| 134 "//gpu/command_buffer/common:gles2_utils", | 137 "//gpu/command_buffer/common:gles2_utils", |
| 135 "//gpu/skia_bindings", | 138 "//gpu/skia_bindings", |
| 139 "//net", |
| 136 "//skia", | 140 "//skia", |
| 141 "//third_party/WebKit/public:blink_headers", |
| 137 "//ui/base/ime:text_input_types", | 142 "//ui/base/ime:text_input_types", |
| 143 "//ui/events:gesture_detection", |
| 138 "//ui/events/blink", | 144 "//ui/events/blink", |
| 139 "//ui/events/gestures/blink", | 145 "//ui/events/gestures/blink", |
| 140 "//ui/gl", | 146 "//ui/gl", |
| 141 ] | 147 ] |
| 142 | 148 |
| 143 public_deps = [ | 149 public_deps = [ |
| 144 "//blimp/common/proto", | 150 "//blimp/common/proto", |
| 145 ] | 151 ] |
| 146 } | 152 } |
| 147 | 153 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 158 deps = [ | 164 deps = [ |
| 159 ":feature", | 165 ":feature", |
| 160 "//base", | 166 "//base", |
| 161 "//base/test:run_all_unittests", | 167 "//base/test:run_all_unittests", |
| 162 "//base/test:test_support", | 168 "//base/test:test_support", |
| 163 "//blimp/common:blimp_common", | 169 "//blimp/common:blimp_common", |
| 164 "//blimp/common/proto", | 170 "//blimp/common/proto", |
| 165 "//blimp/net:blimp_net", | 171 "//blimp/net:blimp_net", |
| 166 "//blimp/net:test_support", | 172 "//blimp/net:test_support", |
| 167 "//cc/proto", | 173 "//cc/proto", |
| 174 "//net", |
| 175 "//net:test_support", |
| 168 "//skia", | 176 "//skia", |
| 169 "//testing/gmock", | 177 "//testing/gmock", |
| 170 "//testing/gtest", | 178 "//testing/gtest", |
| 179 "//ui/events:gesture_detection", |
| 180 "//ui/gfx/geometry", |
| 171 ] | 181 ] |
| 172 | 182 |
| 173 if (is_linux) { | 183 if (is_linux) { |
| 174 #TODO(khushalsagar): Run these tests for android. | 184 #TODO(khushalsagar): Run these tests for android. |
| 175 sources += [ "feature/compositor/blimp_compositor_unittest.cc" ] | 185 sources += [ "feature/compositor/blimp_compositor_unittest.cc" ] |
| 176 } | 186 } |
| 177 } | 187 } |
| 178 | 188 |
| 179 if (is_linux && !is_chromeos && use_x11) { | 189 if (is_linux && !is_chromeos && use_x11) { |
| 180 executable("blimp_shell") { | 190 executable("blimp_shell") { |
| 181 sources = [ | 191 sources = [ |
| 182 "app/linux/blimp_client_session_linux.cc", | 192 "app/linux/blimp_client_session_linux.cc", |
| 183 "app/linux/blimp_client_session_linux.h", | 193 "app/linux/blimp_client_session_linux.h", |
| 184 "app/linux/blimp_display_manager.cc", | 194 "app/linux/blimp_display_manager.cc", |
| 185 "app/linux/blimp_display_manager.h", | 195 "app/linux/blimp_display_manager.h", |
| 186 "app/linux/blimp_main.cc", | 196 "app/linux/blimp_main.cc", |
| 187 ] | 197 ] |
| 188 | 198 |
| 189 deps = [ | 199 deps = [ |
| 190 ":blimp_client", | 200 ":blimp_client", |
| 191 ":feature", | 201 ":feature", |
| 192 "//base", | 202 "//base", |
| 193 "//blimp/net:blimp_net", | 203 "//blimp/net:blimp_net", |
| 194 "//net", | 204 "//net", |
| 195 "//ui/events/platform/x11", | 205 "//ui/events/platform/x11", |
| 206 "//ui/platform_window", |
| 196 "//ui/platform_window/x11", | 207 "//ui/platform_window/x11", |
| 197 ] | 208 ] |
| 198 | 209 |
| 199 public_configs = [ "//build/config/linux:x11" ] | 210 public_configs = [ "//build/config/linux:x11" ] |
| 200 public_deps = [ | 211 public_deps = [ |
| 201 "//ui/events/platform/x11", | 212 "//ui/events/platform/x11", |
| 202 ] | 213 ] |
| 203 } | 214 } |
| 204 } | 215 } |
| 205 | 216 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest
.java", | 366 "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest
.java", |
| 356 ] | 367 ] |
| 357 } | 368 } |
| 358 | 369 |
| 359 shared_library("blimp_client_android") { | 370 shared_library("blimp_client_android") { |
| 360 deps = [ | 371 deps = [ |
| 361 ":blimp_client", | 372 ":blimp_client", |
| 362 ":feature", | 373 ":feature", |
| 363 ":jni_headers", | 374 ":jni_headers", |
| 364 "//base", | 375 "//base", |
| 376 "//blimp/common:blimp_common", |
| 365 "//blimp/common/proto", | 377 "//blimp/common/proto", |
| 366 "//blimp/net:blimp_net", | 378 "//blimp/net:blimp_net", |
| 367 "//components/safe_json/android:safe_json_jni_headers", | 379 "//components/safe_json/android:safe_json_jni_headers", |
| 368 "//components/url_formatter", | 380 "//components/url_formatter", |
| 381 "//net", |
| 369 "//skia", | 382 "//skia", |
| 370 "//ui/base/ime:text_input_types", | 383 "//ui/base/ime:text_input_types", |
| 371 "//ui/gfx/geometry", | 384 "//ui/gfx/geometry", |
| 372 "//ui/gl", | 385 "//ui/gl", |
| 373 "//url:url", | 386 "//url:url", |
| 374 ] | 387 ] |
| 375 | 388 |
| 376 sources = [ | 389 sources = [ |
| 377 "app/android/blimp_client_session_android.cc", | 390 "app/android/blimp_client_session_android.cc", |
| 378 "app/android/blimp_client_session_android.h", | 391 "app/android/blimp_client_session_android.h", |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 apk_name = "BlimpTest" | 430 apk_name = "BlimpTest" |
| 418 apk_under_test = ":blimp_apk" | 431 apk_under_test = ":blimp_apk" |
| 419 android_manifest = blimp_test_apk_manifest | 432 android_manifest = blimp_test_apk_manifest |
| 420 deps = [ | 433 deps = [ |
| 421 ":blimp_test_apk_manifest", | 434 ":blimp_test_apk_manifest", |
| 422 ":blimp_test_java", | 435 ":blimp_test_java", |
| 423 google_play_services_resources, | 436 google_play_services_resources, |
| 424 ] | 437 ] |
| 425 } | 438 } |
| 426 } | 439 } |
| OLD | NEW |