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

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

Issue 2371233002: Blob Channel failed to register service (Closed)
Patch Set: add an output pak in the grd file and have blimp/engine:pak depend on it Created 4 years, 2 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
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 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//mojo/public/tools/bindings/mojom.gni") 9 import("//mojo/public/tools/bindings/mojom.gni")
10 import("//tools/grit/repack.gni") 10 import("//tools/grit/repack.gni")
11 import("//tools/grit/grit_rule.gni") 11 import("//tools/grit/grit_rule.gni")
12 12
13 repack("pak") { 13 repack("pak") {
14 sources = [ 14 sources = [
15 "$root_gen_dir/blimp/blimp_browser_resources.pak",
nyquist 2016/09/27 20:48:48 Does this mean that this will also work within the
Menglin 2016/09/27 22:06:40 Yes. I verified the engine starts correctly in the
15 "$root_gen_dir/blink/public/resources/blink_image_resources_100_percent.pak" , 16 "$root_gen_dir/blink/public/resources/blink_image_resources_100_percent.pak" ,
16 "$root_gen_dir/blink/public/resources/blink_resources.pak", 17 "$root_gen_dir/blink/public/resources/blink_resources.pak",
17 "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", 18 "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
18 "$root_gen_dir/content/app/strings/content_strings_en-US.pak", 19 "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
19 "$root_gen_dir/content/browser/tracing/tracing_resources.pak", 20 "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
20 "$root_gen_dir/content/content_resources.pak", 21 "$root_gen_dir/content/content_resources.pak",
21 "$root_gen_dir/net/net_resources.pak", 22 "$root_gen_dir/net/net_resources.pak",
22 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", 23 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
23 "$root_gen_dir/ui/resources/webui_resources.pak", 24 "$root_gen_dir/ui/resources/webui_resources.pak",
24 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", 25 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
25 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", 26 "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
26 ] 27 ]
27 28
28 deps = [ 29 deps = [
30 ":resources",
29 "//content:resources", 31 "//content:resources",
30 "//content/app/resources", 32 "//content/app/resources",
31 "//content/app/strings", 33 "//content/app/strings",
32 "//content/browser/tracing:resources", 34 "//content/browser/tracing:resources",
33 "//net:net_resources", 35 "//net:net_resources",
34 "//third_party/WebKit/public:image_resources", 36 "//third_party/WebKit/public:image_resources",
35 "//third_party/WebKit/public:resources", 37 "//third_party/WebKit/public:resources",
36 "//ui/resources", 38 "//ui/resources",
37 "//ui/strings", 39 "//ui/strings",
38 ] 40 ]
39 41
40 if (toolkit_views) { 42 if (toolkit_views) {
41 deps += [ "//ui/views/resources" ] 43 deps += [ "//ui/views/resources" ]
42 sources += 44 sources +=
43 [ "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak" ] 45 [ "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak" ]
44 } 46 }
45 47
46 output = "$root_out_dir/blimp_engine.pak" 48 output = "$root_out_dir/blimp_engine.pak"
47 } 49 }
48 50
51 grit("resources") {
nyquist 2016/09/27 20:48:48 Should this have visibility = [ ":*" ]?
Menglin 2016/09/27 22:06:40 Done.
52 source = "app/blimp_browser_resources.grd"
53 use_qualified_include = true
54 output_dir = "$root_gen_dir/blimp"
nyquist 2016/09/27 20:48:48 Should this be $root_gen_dir/blimp/engine ?
Menglin 2016/09/27 22:06:40 Done.
55 outputs = [
56 "grit/blimp_browser_resources.h",
57 "blimp_browser_resources.pak",
58 ]
59 }
60
49 source_set("app") { 61 source_set("app") {
50 sources = [ 62 sources = [
51 "app/blimp_browser_main_parts.cc", 63 "app/blimp_browser_main_parts.cc",
52 "app/blimp_browser_main_parts.h", 64 "app/blimp_browser_main_parts.h",
53 "app/blimp_content_browser_client.cc", 65 "app/blimp_content_browser_client.cc",
54 "app/blimp_content_browser_client.h", 66 "app/blimp_content_browser_client.h",
55 "app/blimp_content_main_delegate.cc", 67 "app/blimp_content_main_delegate.cc",
56 "app/blimp_content_main_delegate.h", 68 "app/blimp_content_main_delegate.h",
57 ] 69 ]
58 70
(...skipping 22 matching lines...) Expand all
81 "//blimp/net", 93 "//blimp/net",
82 "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted", 94 "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted",
83 "//components/crash/content/app:lib", 95 "//components/crash/content/app:lib",
84 "//content/public/app:both", 96 "//content/public/app:both",
85 "//content/public/browser", 97 "//content/public/browser",
86 "//content/public/common", 98 "//content/public/common",
87 "//content/public/renderer", 99 "//content/public/renderer",
88 "//content/public/utility", 100 "//content/public/utility",
89 "//device/geolocation", 101 "//device/geolocation",
90 "//net", 102 "//net",
103 "//ui/base:base",
91 ] 104 ]
92 } 105 }
93 106
94 source_set("app_config") { 107 source_set("app_config") {
95 sources = [ 108 sources = [
96 "app/blimp_engine_config.cc", 109 "app/blimp_engine_config.cc",
97 "app/blimp_engine_config.h", 110 "app/blimp_engine_config.h",
98 ] 111 ]
99 deps = [ 112 deps = [
100 "//base", 113 "//base",
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 "//content/test:test_support", 717 "//content/test:test_support",
705 "//testing/gmock", 718 "//testing/gmock",
706 "//testing/gtest", 719 "//testing/gtest",
707 ] 720 ]
708 721
709 data = [ 722 data = [
710 "//blimp/test/data/", 723 "//blimp/test/data/",
711 "$root_out_dir/blimp_engine.pak", 724 "$root_out_dir/blimp_engine.pak",
712 ] 725 ]
713 } 726 }
OLDNEW
« no previous file with comments | « no previous file | blimp/engine/app/blimp_browser_resources.grd » ('j') | blimp/engine/app/blimp_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698