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

Side by Side Diff: components/html_viewer/BUILD.gn

Issue 1410643013: GN: Fix references to $root_build_dir/natives_blob.bin -> $root_out_dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | content/shell/android/BUILD.gn » ('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("//build_overrides/v8.gni") 5 import("//build_overrides/v8.gni")
6 import("//mojo/public/mojo_application.gni") 6 import("//mojo/public/mojo_application.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 import("//tools/grit/repack.gni") 9 import("//tools/grit/repack.gni")
10 10
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 ":lib", 237 ":lib",
238 ":pak", 238 ":pak",
239 "//base", 239 "//base",
240 "//mojo/application/public/cpp:sources", 240 "//mojo/application/public/cpp:sources",
241 "//third_party/mojo/src/mojo/public/c/system:for_shared_library", 241 "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
242 ] 242 ]
243 resources = [ "$root_out_dir/html_viewer.pak" ] 243 resources = [ "$root_out_dir/html_viewer.pak" ]
244 244
245 if (v8_use_external_startup_data) { 245 if (v8_use_external_startup_data) {
246 resources += [ 246 resources += [
247 "$root_build_dir/natives_blob.bin", 247 "$root_out_dir/natives_blob.bin",
248 "$root_build_dir/snapshot_blob.bin", 248 "$root_out_dir/snapshot_blob.bin",
249 ] 249 ]
250 deps += [ "//gin" ] 250 deps += [ "//gin" ]
251 } 251 }
252 } 252 }
253 253
254 mojo_native_application("layout_test_html_viewer") { 254 mojo_native_application("layout_test_html_viewer") {
255 testonly = true 255 testonly = true
256 sources = [ 256 sources = [
257 "layout_test_blink_settings_impl.cc", 257 "layout_test_blink_settings_impl.cc",
258 "layout_test_blink_settings_impl.h", 258 "layout_test_blink_settings_impl.h",
(...skipping 15 matching lines...) Expand all
274 "//third_party/WebKit/public:blink", 274 "//third_party/WebKit/public:blink",
275 "//third_party/WebKit/public:test_support", 275 "//third_party/WebKit/public:test_support",
276 "//third_party/mojo/src/mojo/public/c/system:for_shared_library", 276 "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
277 "//ui/base", 277 "//ui/base",
278 "//url", 278 "//url",
279 ] 279 ]
280 resources = [ "$root_out_dir/html_viewer.pak" ] 280 resources = [ "$root_out_dir/html_viewer.pak" ]
281 281
282 if (v8_use_external_startup_data) { 282 if (v8_use_external_startup_data) {
283 resources += [ 283 resources += [
284 "$root_build_dir/natives_blob.bin", 284 "$root_out_dir/natives_blob.bin",
285 "$root_build_dir/snapshot_blob.bin", 285 "$root_out_dir/snapshot_blob.bin",
286 ] 286 ]
287 deps += [ "//gin" ] 287 deps += [ "//gin" ]
288 } 288 }
289 } 289 }
290 290
291 if (is_android) { 291 if (is_android) {
292 html_viewer_unittests_assets = "$root_build_dir/html_viewer_unittests_assets" 292 html_viewer_unittests_assets = "$root_build_dir/html_viewer_unittests_assets"
293 293
294 copy_ex("copy_unittest_assets") { 294 copy_ex("copy_unittest_assets") {
295 clear_dir = true 295 clear_dir = true
296 deps = [ 296 deps = [
297 ":pak", 297 ":pak",
298 "//gin", 298 "//gin",
299 "//third_party/icu:icudata", 299 "//third_party/icu:icudata",
300 ] 300 ]
301 dest = html_viewer_unittests_assets 301 dest = html_viewer_unittests_assets
302 sources = [ 302 sources = [
303 "$root_build_dir/html_viewer.pak", 303 "$root_build_dir/html_viewer.pak",
304 "$root_build_dir/icudtl.dat", 304 "$root_build_dir/icudtl.dat",
305 "$root_build_dir/natives_blob.bin", 305 "$root_out_dir/natives_blob.bin",
306 "$root_build_dir/snapshot_blob.bin", 306 "$root_out_dir/snapshot_blob.bin",
307 ] 307 ]
308 } 308 }
309 309
310 generate_mojo_shell_assets_list("build_unittest_assets") { 310 generate_mojo_shell_assets_list("build_unittest_assets") {
311 deps = [ 311 deps = [
312 ":copy_unittest_assets", 312 ":copy_unittest_assets",
313 ] 313 ]
314 dir = html_viewer_unittests_assets 314 dir = html_viewer_unittests_assets
315 } 315 }
316 } 316 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 ] 372 ]
373 373
374 data_deps = [ 374 data_deps = [
375 ":html_viewer", 375 ":html_viewer",
376 ] 376 ]
377 377
378 if (is_linux && !is_android) { 378 if (is_linux && !is_android) {
379 data_deps += [ "//components/font_service" ] 379 data_deps += [ "//components/font_service" ]
380 } 380 }
381 } 381 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698