Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: blimp/client/BUILD.gn

Issue 1551683002: [Blimp Client] Land CL 1528243002 (Add a basic linux client for Blimp) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « blimp/BUILD.gn ('k') | blimp/client/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 if (is_android) { 5 if (is_android) {
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 } 8 }
9 9
10 component("blimp_client") { 10 component("blimp_client") {
11 sources = [ 11 sources = [
12 "blimp_client_export.h", 12 "blimp_client_export.h",
13 "blimp_startup.cc",
14 "blimp_startup.h",
13 "compositor/blimp_compositor.cc", 15 "compositor/blimp_compositor.cc",
14 "compositor/blimp_compositor.h", 16 "compositor/blimp_compositor.h",
15 "compositor/blimp_context_provider.cc", 17 "compositor/blimp_context_provider.cc",
16 "compositor/blimp_context_provider.h", 18 "compositor/blimp_context_provider.h",
17 "compositor/blimp_layer_tree_settings.cc", 19 "compositor/blimp_layer_tree_settings.cc",
18 "compositor/blimp_layer_tree_settings.h", 20 "compositor/blimp_layer_tree_settings.h",
19 "compositor/blimp_output_surface.cc", 21 "compositor/blimp_output_surface.cc",
20 "compositor/blimp_output_surface.h", 22 "compositor/blimp_output_surface.h",
21 "compositor/test/dummy_layer_driver.cc", 23 "compositor/test/dummy_layer_driver.cc",
22 "compositor/test/dummy_layer_driver.h", 24 "compositor/test/dummy_layer_driver.h",
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 "//blimp/common/proto", 78 "//blimp/common/proto",
77 "//blimp/net:blimp_net", 79 "//blimp/net:blimp_net",
78 "//blimp/net:test_support", 80 "//blimp/net:test_support",
79 "//cc/proto", 81 "//cc/proto",
80 "//skia", 82 "//skia",
81 "//testing/gmock", 83 "//testing/gmock",
82 "//testing/gtest", 84 "//testing/gtest",
83 ] 85 ]
84 } 86 }
85 87
88 if (is_linux && !is_chromeos) {
89 executable("blimp_shell") {
90 sources = [
91 "linux/blimp_display_manager.cc",
92 "linux/blimp_display_manager.h",
93 "linux/blimp_main.cc",
94 "session/blimp_client_session_linux.cc",
95 "session/blimp_client_session_linux.h",
96 ]
97
98 deps = [
99 ":blimp_client",
100 "//base",
101 "//ui/events/platform/x11",
102 "//ui/platform_window/x11",
103 ]
104
105 public_configs = [ "//build/config/linux:x11" ]
106 public_deps = [
107 "//ui/events/platform/x11",
108 ]
109 }
110 }
111
86 if (is_android) { 112 if (is_android) {
87 manifest_package = "org.chromium.blimp" 113 manifest_package = "org.chromium.blimp"
88 blimp_apk_manifest = "$target_gen_dir/blimp_apk_manifest/AndroidManifest.xml" 114 blimp_apk_manifest = "$target_gen_dir/blimp_apk_manifest/AndroidManifest.xml"
89 blimp_test_apk_manifest = 115 blimp_test_apk_manifest =
90 "$target_gen_dir/blimp_test_apk_manifest/AndroidManifest.xml" 116 "$target_gen_dir/blimp_test_apk_manifest/AndroidManifest.xml"
91 117
92 jinja_variables = [ "manifest_package=$manifest_package" ] 118 jinja_variables = [ "manifest_package=$manifest_package" ]
93 119
94 jinja_template("blimp_apk_manifest") { 120 jinja_template("blimp_apk_manifest") {
95 input = "android/AndroidManifest.xml.jinja2" 121 input = "android/AndroidManifest.xml.jinja2"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 apk_name = "BlimpTest" 292 apk_name = "BlimpTest"
267 apk_under_test = ":blimp_apk" 293 apk_under_test = ":blimp_apk"
268 android_manifest = blimp_test_apk_manifest 294 android_manifest = blimp_test_apk_manifest
269 deps = [ 295 deps = [
270 ":blimp_test_apk_manifest", 296 ":blimp_test_apk_manifest",
271 ":blimp_test_java", 297 ":blimp_test_java",
272 google_play_services_resources, 298 google_play_services_resources,
273 ] 299 ]
274 } 300 }
275 } 301 }
OLDNEW
« no previous file with comments | « blimp/BUILD.gn ('k') | blimp/client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698