| 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 } |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 "feature/compositor/blimp_gpu_memory_buffer_manager.cc", | 69 "feature/compositor/blimp_gpu_memory_buffer_manager.cc", |
| 70 "feature/compositor/blimp_gpu_memory_buffer_manager.h", | 70 "feature/compositor/blimp_gpu_memory_buffer_manager.h", |
| 71 "feature/compositor/blimp_input_handler_wrapper.cc", | 71 "feature/compositor/blimp_input_handler_wrapper.cc", |
| 72 "feature/compositor/blimp_input_handler_wrapper.h", | 72 "feature/compositor/blimp_input_handler_wrapper.h", |
| 73 "feature/compositor/blimp_input_manager.cc", | 73 "feature/compositor/blimp_input_manager.cc", |
| 74 "feature/compositor/blimp_input_manager.h", | 74 "feature/compositor/blimp_input_manager.h", |
| 75 "feature/compositor/blimp_layer_tree_settings.cc", | 75 "feature/compositor/blimp_layer_tree_settings.cc", |
| 76 "feature/compositor/blimp_layer_tree_settings.h", | 76 "feature/compositor/blimp_layer_tree_settings.h", |
| 77 "feature/compositor/blimp_output_surface.cc", | 77 "feature/compositor/blimp_output_surface.cc", |
| 78 "feature/compositor/blimp_output_surface.h", | 78 "feature/compositor/blimp_output_surface.h", |
| 79 "feature/compositor/test/dummy_layer_driver.cc", | |
| 80 "feature/compositor/test/dummy_layer_driver.h", | |
| 81 "feature/navigation_feature.cc", | 79 "feature/navigation_feature.cc", |
| 82 "feature/navigation_feature.h", | 80 "feature/navigation_feature.h", |
| 83 "feature/render_widget_feature.cc", | 81 "feature/render_widget_feature.cc", |
| 84 "feature/render_widget_feature.h", | 82 "feature/render_widget_feature.h", |
| 85 "feature/tab_control_feature.cc", | 83 "feature/tab_control_feature.cc", |
| 86 "feature/tab_control_feature.h", | 84 "feature/tab_control_feature.h", |
| 87 ] | 85 ] |
| 88 | 86 |
| 89 deps = [ | 87 deps = [ |
| 90 "//blimp/common:blimp_common", | 88 "//blimp/common:blimp_common", |
| (...skipping 30 matching lines...) Expand all Loading... |
| 121 "//base/test:test_support", | 119 "//base/test:test_support", |
| 122 "//blimp/common:blimp_common", | 120 "//blimp/common:blimp_common", |
| 123 "//blimp/common/proto", | 121 "//blimp/common/proto", |
| 124 "//blimp/net:blimp_net", | 122 "//blimp/net:blimp_net", |
| 125 "//blimp/net:test_support", | 123 "//blimp/net:test_support", |
| 126 "//cc/proto", | 124 "//cc/proto", |
| 127 "//skia", | 125 "//skia", |
| 128 "//testing/gmock", | 126 "//testing/gmock", |
| 129 "//testing/gtest", | 127 "//testing/gtest", |
| 130 ] | 128 ] |
| 129 |
| 130 if (is_linux) { |
| 131 #TODO(khushalsagar): Run these tests for android. |
| 132 sources += [ "feature/compositor/blimp_compositor_unittest.cc" ] |
| 133 } |
| 131 } | 134 } |
| 132 | 135 |
| 133 if (is_linux && !is_chromeos && use_x11) { | 136 if (is_linux && !is_chromeos && use_x11) { |
| 134 executable("blimp_shell") { | 137 executable("blimp_shell") { |
| 135 sources = [ | 138 sources = [ |
| 136 "app/linux/blimp_client_session_linux.cc", | 139 "app/linux/blimp_client_session_linux.cc", |
| 137 "app/linux/blimp_client_session_linux.h", | 140 "app/linux/blimp_client_session_linux.h", |
| 138 "app/linux/blimp_display_manager.cc", | 141 "app/linux/blimp_display_manager.cc", |
| 139 "app/linux/blimp_display_manager.h", | 142 "app/linux/blimp_display_manager.h", |
| 140 "app/linux/blimp_main.cc", | 143 "app/linux/blimp_main.cc", |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 apk_name = "BlimpTest" | 350 apk_name = "BlimpTest" |
| 348 apk_under_test = ":blimp_apk" | 351 apk_under_test = ":blimp_apk" |
| 349 android_manifest = blimp_test_apk_manifest | 352 android_manifest = blimp_test_apk_manifest |
| 350 deps = [ | 353 deps = [ |
| 351 ":blimp_test_apk_manifest", | 354 ":blimp_test_apk_manifest", |
| 352 ":blimp_test_java", | 355 ":blimp_test_java", |
| 353 google_play_services_resources, | 356 google_play_services_resources, |
| 354 ] | 357 ] |
| 355 } | 358 } |
| 356 } | 359 } |
| OLD | NEW |