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

Side by Side Diff: chrome/chrome_paks.gni

Issue 2485673002: Bundle some ash resources into chrome for mash=1 use_ash=0 (Closed)
Patch Set: Bundle some ash resources into chrome for mash=1 use_ash=0 Created 4 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 | « no previous file | chrome/chrome_repack_locales.gni » ('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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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/locales.gni") 5 import("//build/config/locales.gni")
6 import("//chrome/common/features.gni") 6 import("//chrome/common/features.gni")
7 import("//ui/base/ui_features.gni") 7 import("//ui/base/ui_features.gni")
8 import("chrome_repack_locales.gni") 8 import("chrome_repack_locales.gni")
9 9
10 # Generates a rule to repack a set of resources, substituting a given string 10 # Generates a rule to repack a set of resources, substituting a given string
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 "//content/app/resources", 44 "//content/app/resources",
45 "//net:net_resources", 45 "//net:net_resources",
46 "//third_party/WebKit/public:image_resources", 46 "//third_party/WebKit/public:image_resources",
47 "//ui/resources", 47 "//ui/resources",
48 ] 48 ]
49 49
50 if (defined(invoker.deps)) { 50 if (defined(invoker.deps)) {
51 deps += invoker.deps 51 deps += invoker.deps
52 } 52 }
53 53
54 if (use_ash) { 54 # Chrome --mash in non-chromeos builds need to access some ash resources
55 # in order to avoid some missing icons in Ash's window manager session.
56 # TODO(tonikitoo): Remove this when a chrome/mus is available.
57 if (use_ash || enable_package_mash_services) {
55 sources += 58 sources +=
56 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] 59 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
57 deps += [ "//ash/resources" ] 60 deps += [ "//ash/resources" ]
58 } 61 }
59 if (toolkit_views) { 62 if (toolkit_views) {
60 sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_ percent.pak" ] 63 sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_ percent.pak" ]
61 deps += [ "//ui/views/resources" ] 64 deps += [ "//ui/views/resources" ]
62 } 65 }
63 if (is_chromeos) { 66 if (is_chromeos) {
64 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ] 67 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ]
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 ":${target_name}_locales", 254 ":${target_name}_locales",
252 ] 255 ]
253 if (enable_hidpi) { 256 if (enable_hidpi) {
254 public_deps += [ ":${target_name}_200_percent" ] 257 public_deps += [ ":${target_name}_200_percent" ]
255 } 258 }
256 if (defined(invoker.public_deps)) { 259 if (defined(invoker.public_deps)) {
257 public_deps += invoker.public_deps 260 public_deps += invoker.public_deps
258 } 261 }
259 } 262 }
260 } 263 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698