Chromium Code Reviews| 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 import("//tools/grit/repack.gni") | |
| 6 | 7 |
| 7 if (is_android) { | 8 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 9 import("//build/config/android/config.gni") |
| 9 import("//build/config/android/rules.gni") | 10 import("//build/config/android/rules.gni") |
| 10 } | 11 } |
| 11 | 12 |
| 12 source_set("app") { | 13 source_set("app") { |
| 13 visibility = [ | 14 visibility = [ |
| 14 ":*", | 15 ":*", |
| 15 "//blimp/client:*", | 16 "//blimp/client:*", |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 44 "//blimp/client/public:public_headers", | 45 "//blimp/client/public:public_headers", |
| 45 "//blimp/client/support", | 46 "//blimp/client/support", |
| 46 "//blimp/common", | 47 "//blimp/common", |
| 47 "//blimp/common/proto", | 48 "//blimp/common/proto", |
| 48 "//blimp/net", | 49 "//blimp/net", |
| 49 "//cc", | 50 "//cc", |
| 50 "//gpu/command_buffer/client:gles2_implementation", | 51 "//gpu/command_buffer/client:gles2_implementation", |
| 51 "//gpu/skia_bindings", | 52 "//gpu/skia_bindings", |
| 52 "//net", | 53 "//net", |
| 53 "//third_party/libwebp", | 54 "//third_party/libwebp", |
| 55 "//ui/base:base", | |
| 54 "//ui/gfx/geometry", | 56 "//ui/gfx/geometry", |
| 55 "//ui/gl", | 57 "//ui/gl", |
| 56 "//ui/gl/init", | 58 "//ui/gl/init", |
| 57 "//url:url", | 59 "//url:url", |
| 58 ] | 60 ] |
| 59 } | 61 } |
| 60 | 62 |
| 61 source_set("session") { | 63 source_set("session") { |
| 62 visibility = [ | 64 visibility = [ |
| 63 ":*", | 65 ":*", |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 "linux/blimp_client_context_delegate_linux.h", | 135 "linux/blimp_client_context_delegate_linux.h", |
| 134 "linux/blimp_display_manager.cc", | 136 "linux/blimp_display_manager.cc", |
| 135 "linux/blimp_display_manager.h", | 137 "linux/blimp_display_manager.h", |
| 136 "linux/blimp_display_manager_delegate_main.cc", | 138 "linux/blimp_display_manager_delegate_main.cc", |
| 137 "linux/blimp_display_manager_delegate_main.h", | 139 "linux/blimp_display_manager_delegate_main.h", |
| 138 "linux/blimp_main.cc", | 140 "linux/blimp_main.cc", |
| 139 ] | 141 ] |
| 140 | 142 |
| 141 deps = [ | 143 deps = [ |
| 142 ":app", | 144 ":app", |
| 145 ":pak", | |
| 143 "//base", | 146 "//base", |
| 144 "//blimp/client/core/compositor", | 147 "//blimp/client/core/compositor", |
| 148 "//blimp/client/core/resources", | |
| 145 "//blimp/client/core/session", | 149 "//blimp/client/core/session", |
| 146 "//blimp/net", | 150 "//blimp/net", |
| 147 "//net", | 151 "//net", |
| 148 "//services/service_manager/public/cpp", | 152 "//services/service_manager/public/cpp", |
| 149 | 153 |
| 150 # TODO(khushalsagar|scottmg): Remove this dependency from browser to | 154 # TODO(khushalsagar|scottmg): Remove this dependency from browser to |
| 151 # blink. See https://crbug.com/608114. | 155 # blink. See https://crbug.com/608114. |
| 152 "//third_party/WebKit/public:blink", | 156 "//third_party/WebKit/public:blink", |
| 153 "//ui/events/platform/x11", | 157 "//ui/events/platform/x11", |
| 154 "//ui/platform_window", | 158 "//ui/platform_window", |
| 155 "//ui/platform_window/x11", | 159 "//ui/platform_window/x11", |
| 156 ] | 160 ] |
| 157 | 161 |
| 158 public_configs = [ "//build/config/linux:x11" ] | 162 public_configs = [ "//build/config/linux:x11" ] |
| 159 public_deps = [ | 163 public_deps = [ |
| 160 "//blimp/client/core/contents", | 164 "//blimp/client/core/contents", |
| 161 "//ui/events/platform/x11", | 165 "//ui/events/platform/x11", |
| 162 ] | 166 ] |
| 163 } | 167 } |
| 164 } | 168 } |
| 165 | 169 |
| 170 # Resources file for linux client. | |
| 171 repack("pak") { | |
|
David Trainor- moved to gerrit
2016/10/26 00:43:18
Why do we need to just pull the english version ag
xingliu
2016/10/26 21:14:41
Added another target in public/resources/BUILD.gn.
| |
| 172 sources = [ | |
| 173 "$root_gen_dir/blimp/client/core/resources/blimp_strings_en-US.pak", | |
| 174 ] | |
| 175 | |
| 176 deps = [ | |
| 177 "//blimp/client/core/resources", | |
| 178 ] | |
| 179 | |
| 180 output = "$root_out_dir/blimp_shell.pak" | |
| 181 } | |
| 182 | |
| 166 if (is_android) { | 183 if (is_android) { |
| 167 declare_args() { | 184 declare_args() { |
| 168 # Package name used in the manifest for the Blimp APK. | 185 # Package name used in the manifest for the Blimp APK. |
| 169 blimp_package_name = "org.chromium.blimp" | 186 blimp_package_name = "org.chromium.blimp" |
| 170 } | 187 } |
| 171 | 188 |
| 172 manifest_package = blimp_package_name | 189 manifest_package = blimp_package_name |
| 173 blimp_apk_manifest = "$target_gen_dir/blimp_apk_manifest/AndroidManifest.xml" | 190 blimp_apk_manifest = "$target_gen_dir/blimp_apk_manifest/AndroidManifest.xml" |
| 174 blimp_test_apk_manifest = | 191 blimp_test_apk_manifest = |
| 175 "$target_gen_dir/blimp_test_apk_manifest/AndroidManifest.xml" | 192 "$target_gen_dir/blimp_test_apk_manifest/AndroidManifest.xml" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 397 instrumentation_test_apk("blimp_test_apk") { | 414 instrumentation_test_apk("blimp_test_apk") { |
| 398 apk_name = "BlimpTest" | 415 apk_name = "BlimpTest" |
| 399 apk_under_test = ":blimp_apk" | 416 apk_under_test = ":blimp_apk" |
| 400 android_manifest = blimp_test_apk_manifest | 417 android_manifest = blimp_test_apk_manifest |
| 401 android_manifest_dep = ":blimp_test_apk_manifest" | 418 android_manifest_dep = ":blimp_test_apk_manifest" |
| 402 deps = [ | 419 deps = [ |
| 403 ":blimp_test_java", | 420 ":blimp_test_java", |
| 404 ] | 421 ] |
| 405 } | 422 } |
| 406 } | 423 } |
| OLD | NEW |