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

Side by Side Diff: ui/resources/BUILD.gn

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « ui/chromeos/ui_chromeos_strings.grd ('k') | ui/resources/ui_resources.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 import("//tools/grit/repack.gni") 6 import("//tools/grit/repack.gni")
7 7
8 # GYP version: ui/resources/ui_resources.gyp:ui_resources 8 # GYP version: ui/resources/ui_resources.gyp:ui_resources
9 group("resources") { 9 group("resources") {
10 deps = [ 10 deps = [
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 # Depend on ui_test_pak instead of this one. 72 # Depend on ui_test_pak instead of this one.
73 visibility = [ ":ui_test_pak" ] 73 visibility = [ ":ui_test_pak" ]
74 74
75 sources = [ 75 sources = [
76 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", 76 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
77 "$root_gen_dir/ui/resources/webui_resources.pak", 77 "$root_gen_dir/ui/resources/webui_resources.pak",
78 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", 78 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
79 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", 79 "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
80 ] 80 ]
81 81
82 if (is_chromeos) {
83 sources += [
84 "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak ",
85 "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak",
86 ]
87 }
88
89 output = "$root_out_dir/ui_test.pak" 82 output = "$root_out_dir/ui_test.pak"
90 83
91 deps = [ 84 deps = [
92 "//ui/resources", 85 "//ui/resources",
93 "//ui/strings", 86 "//ui/strings",
94 ] 87 ]
95 88
96 if (!is_mac) { 89 if (!is_mac) {
97 deps += [ ":copy_ui_resources_100_percent" ] 90 deps += [ ":copy_ui_resources_100_percent" ]
98 } 91 }
99
100 if (is_chromeos) {
101 deps += [
102 "//ui/chromeos/resources",
103 "//ui/chromeos/strings",
104 ]
105 }
106 } 92 }
107 93
108 # Repack just the strings for the framework locales on Mac and iOS. This 94 # Repack just the strings for the framework locales on Mac and iOS. This
109 # emulates repack_locales.py, but just for en-US. Note ui_test.pak is not simply 95 # emulates repack_locales.py, but just for en-US. Note ui_test.pak is not simply
110 # copied, because it causes leaks from allocations within system libraries when 96 # copied, because it causes leaks from allocations within system libraries when
111 # trying to load non-string resources. http://crbug.com/413034. 97 # trying to load non-string resources. http://crbug.com/413034.
112 repack("repack_ui_test_mac_locale_pack") { 98 repack("repack_ui_test_mac_locale_pack") {
113 visibility = [ ":ui_test_pak" ] 99 visibility = [ ":ui_test_pak" ]
114 100
115 sources = [ 101 sources = [
116 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", 102 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
117 "$root_gen_dir/ui/strings/ui_strings_en-US.pak", 103 "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
118 ] 104 ]
119 105
120 output = "$root_out_dir/ui/en.lproj/locale.pak" 106 output = "$root_out_dir/ui/en.lproj/locale.pak"
121 107
122 deps = [ 108 deps = [
123 "//ui/strings", 109 "//ui/strings",
124 ] 110 ]
125 } 111 }
OLDNEW
« no previous file with comments | « ui/chromeos/ui_chromeos_strings.grd ('k') | ui/resources/ui_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698