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

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

Issue 1435333008: GN: asset_location -> android_assets() for html_viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaswe Created 5 years 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 | « build/config/android/rules.gni ('k') | testing/test.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 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
11 if (is_android) { 11 if (is_android) {
12 import("//build/config/android/internal_rules.gni") 12 import("//build/config/android/rules.gni")
13 import("//mojo/generate_mojo_shell_assets_list.gni") 13 import("//mojo/generate_mojo_shell_assets_list.gni")
14 } 14 }
15 15
16 grit("html_viewer_resources_grit") { 16 grit("html_viewer_resources_grit") {
17 source = "html_viewer_resources.grd" 17 source = "html_viewer_resources.grd"
18 outputs = [ 18 outputs = [
19 "grit/html_viewer_resources.h", 19 "grit/html_viewer_resources.h",
20 "html_viewer_resources.pak", 20 "html_viewer_resources.pak",
21 ] 21 ]
22 } 22 }
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 if (v8_use_external_startup_data) { 284 if (v8_use_external_startup_data) {
285 resources += [ 285 resources += [
286 "$root_out_dir/natives_blob.bin", 286 "$root_out_dir/natives_blob.bin",
287 "$root_out_dir/snapshot_blob.bin", 287 "$root_out_dir/snapshot_blob.bin",
288 ] 288 ]
289 deps += [ "//gin" ] 289 deps += [ "//gin" ]
290 } 290 }
291 } 291 }
292 292
293 if (is_android) { 293 if (is_android) {
294 html_viewer_unittests_assets = "$root_build_dir/html_viewer_unittests_assets" 294 android_assets("unittest_assets") {
295
296 copy_ex("copy_unittest_assets") {
297 clear_dir = true
298 deps = [
299 ":pak",
300 "//gin",
301 ]
302 dest = html_viewer_unittests_assets
303 sources = [ 295 sources = [
304 "$root_build_dir/html_viewer.pak", 296 "$root_build_dir/html_viewer.pak",
305 ] 297 ]
306 renaming_sources = v8_external_startup_data_renaming_sources
307 renaming_destinations = v8_external_startup_data_renaming_destinations
308 }
309
310 generate_mojo_shell_assets_list("build_unittest_assets") {
311 deps = [ 298 deps = [
312 ":copy_unittest_assets", 299 ":pak",
300 "//v8:v8_external_startup_data_assets",
313 ] 301 ]
314 dir = html_viewer_unittests_assets 302 disable_compression = true
315 } 303 }
316 } 304 }
317 305
318 test("html_viewer_unittests") { 306 test("html_viewer_unittests") {
319 sources = [ 307 sources = [
320 "ax_provider_impl_unittest.cc", 308 "ax_provider_impl_unittest.cc",
321 "discardable_memory_allocator_unittest.cc", 309 "discardable_memory_allocator_unittest.cc",
322 "input_events_unittest.cc", 310 "input_events_unittest.cc",
323 "run_all_unittests.cc", 311 "run_all_unittests.cc",
324 ] 312 ]
325 deps = [ 313 deps = [
326 ":lib", 314 ":lib",
327 ":pak", 315 ":pak",
328 "//base/test:test_support", 316 "//base/test:test_support",
329 "//components/scheduler", 317 "//components/scheduler",
330 "//gin", 318 "//gin",
331 "//mojo/converters/input_events", 319 "//mojo/converters/input_events",
332 "//mojo/gles2", 320 "//mojo/gles2",
333 "//mojo/platform_handle:platform_handle_impl", 321 "//mojo/platform_handle:platform_handle_impl",
334 "//testing/gtest:gtest", 322 "//testing/gtest:gtest",
335 "//third_party/mojo/src/mojo/edk/system", 323 "//third_party/mojo/src/mojo/edk/system",
336 "//ui/base", 324 "//ui/base",
337 "//ui/events", 325 "//ui/events",
338 "//ui/events:test_support", 326 "//ui/events:test_support",
339 "//ui/mojo/init", 327 "//ui/mojo/init",
340 ] 328 ]
341 329
342 if (is_android) { 330 if (is_android) {
343 deps += [ ":build_unittest_assets" ] 331 apk_deps = [ ":unittest_assets" ]
344 apk_asset_location = html_viewer_unittests_assets 332 write_asset_list = true
345 } 333 }
346 334
347 configs += [ "//v8:external_startup_data" ] 335 configs += [ "//v8:external_startup_data" ]
348 } 336 }
349 337
350 mojo_native_application("apptests") { 338 mojo_native_application("apptests") {
351 output_name = "html_viewer_apptests" 339 output_name = "html_viewer_apptests"
352 testonly = true 340 testonly = true
353 341
354 sources = [ 342 sources = [
(...skipping 20 matching lines...) Expand all
375 ] 363 ]
376 364
377 data_deps = [ 365 data_deps = [
378 ":html_viewer", 366 ":html_viewer",
379 ] 367 ]
380 368
381 if (is_linux && !is_android) { 369 if (is_linux && !is_android) {
382 data_deps += [ "//components/font_service" ] 370 data_deps += [ "//components/font_service" ]
383 } 371 }
384 } 372 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | testing/test.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698