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

Side by Side Diff: chrome/test/data/nacl/nacl_test_data.gyp

Issue 409753002: Add a dependency on the AOT shim to all nacl_test_data PNaCl nexe targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'includes': [ 6 'includes': [
7 '../../../../ppapi/ppapi_nacl_test_common.gypi', 7 '../../../../ppapi/ppapi_nacl_test_common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'enable_x86_32_nonsfi': 1, 44 'enable_x86_32_nonsfi': 1,
45 }, 45 },
46 }], 46 }],
47 ], 47 ],
48 }, 48 },
49 { 49 {
50 'target_name': 'simple_test', 50 'target_name': 'simple_test',
51 'type': 'none', 51 'type': 'none',
52 'variables': { 52 'variables': {
53 'nexe_target': 'simple', 53 'nexe_target': 'simple',
54 'build_newlib': 1, 54 'build_newlib': 1,
Mark Seaborn 2014/07/22 03:28:08 To clarify: I think it's possible to disable trans
jvoung (off chromium) 2014/07/22 15:40:54 Yes, that helps disable pexe to nexe, but it also
55 'build_glibc': 1, 55 'build_glibc': 1,
56 'build_pnacl_newlib': 1, 56 'build_pnacl_newlib': 1,
57 'nexe_destination_dir': 'nacl_test_data', 57 'nexe_destination_dir': 'nacl_test_data',
58 'sources': [ 58 'sources': [
59 'simple.cc', 59 'simple.cc',
60 ], 60 ],
61 'test_files': [ 61 'test_files': [
62 'nacl_load_test.html', 62 'nacl_load_test.html',
63 ], 63 ],
64 }, 64 },
65 # We only need the pexe for this test. However, build_pnacl_newlib: 1
66 # will also translate that pexe into a nexe, so add the shim
67 # just in case of a race condition.
68 'dependencies': [
69 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
70 ],
65 }, 71 },
66 { 72 {
67 'target_name': 'exit_status_test', 73 'target_name': 'exit_status_test',
68 'type': 'none', 74 'type': 'none',
69 'variables': { 75 'variables': {
70 'nexe_target': 'pm_exit_status_test', 76 'nexe_target': 'pm_exit_status_test',
71 'build_newlib': 1, 77 'build_newlib': 1,
72 'build_glibc': 1, 78 'build_glibc': 1,
73 'build_pnacl_newlib': 1, 79 'build_pnacl_newlib': 1,
74 'nexe_destination_dir': 'nacl_test_data', 80 'nexe_destination_dir': 'nacl_test_data',
75 'sources': [ 81 'sources': [
76 'exit_status/pm_exit_status_test.cc', 82 'exit_status/pm_exit_status_test.cc',
77 ], 83 ],
78 'test_files': [ 84 'test_files': [
79 'exit_status/pm_exit_status_test.html', 85 'exit_status/pm_exit_status_test.html',
80 ], 86 ],
81 }, 87 },
88 'dependencies': [
89 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
90 ],
82 }, 91 },
83 { 92 {
84 'target_name': 'extension_validation_cache', 93 'target_name': 'extension_validation_cache',
85 'type': 'none', 94 'type': 'none',
86 'variables': { 95 'variables': {
87 'nexe_target': 'extension_validation_cache', 96 'nexe_target': 'extension_validation_cache',
88 # The test currently only has the test expectations for the 97 # The test currently only has the test expectations for the
89 # newlib case (# validation queries/settings), and has also 98 # newlib case (# validation queries/settings), and has also
90 # hardcoded the newlib variant's directory path for the unpacked ext. 99 # hardcoded the newlib variant's directory path for the unpacked ext.
91 'build_newlib': 1, 100 'build_newlib': 1,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'build_glibc': 1, 132 'build_glibc': 1,
124 'build_pnacl_newlib': 1, 133 'build_pnacl_newlib': 1,
125 'nexe_destination_dir': 'nacl_test_data', 134 'nexe_destination_dir': 'nacl_test_data',
126 'sources': [ 135 'sources': [
127 'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc', 136 'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc',
128 ], 137 ],
129 'test_files': [ 138 'test_files': [
130 'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html', 139 'sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html',
131 ], 140 ],
132 }, 141 },
142 'dependencies': [
jvoung (off chromium) 2014/07/22 00:50:28 some of these should also depend on prep_toolchain
Mark Seaborn 2014/07/22 03:28:08 Is there any reason why this this dependency can't
jvoung (off chromium) 2014/07/22 15:40:54 That would be nice. I haven't tried it though. Cur
143 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
144 ],
133 }, 145 },
134 { 146 {
135 'target_name': 'ppapi_test_lib', 147 'target_name': 'ppapi_test_lib',
136 'type': 'none', 148 'type': 'none',
137 'variables': { 149 'variables': {
138 'nlib_target': 'libppapi_test_lib.a', 150 'nlib_target': 'libppapi_test_lib.a',
139 'nso_target': 'libppapi_test_lib.so', 151 'nso_target': 'libppapi_test_lib.so',
140 'build_newlib': 1, 152 'build_newlib': 1,
141 'build_glibc': 1, 153 'build_glibc': 1,
142 'build_pnacl_newlib': 1, 154 'build_pnacl_newlib': 1,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 ], 207 ],
196 'test_files': [ 208 'test_files': [
197 'progress_events/ppapi_progress_events.html', 209 'progress_events/ppapi_progress_events.html',
198 ], 210 ],
199 }, 211 },
200 'dependencies': [ 212 'dependencies': [
201 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 213 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
202 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 214 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
203 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 215 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
204 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 216 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
217 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
205 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 218 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
206 'ppapi_test_lib', 219 'ppapi_test_lib',
207 ], 220 ],
208 }, 221 },
209 { 222 {
210 'target_name': 'ppapi_bad_ppp_initialize', 223 'target_name': 'ppapi_bad_ppp_initialize',
211 'type': 'none', 224 'type': 'none',
212 'variables': { 225 'variables': {
213 'nexe_target': 'ppapi_bad_ppp_initialize', 226 'nexe_target': 'ppapi_bad_ppp_initialize',
214 'build_newlib': 1, 227 'build_newlib': 1,
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 ], 386 ],
374 'sources': [ 387 'sources': [
375 'crash/ppapi_crash_via_check_failure.cc', 388 'crash/ppapi_crash_via_check_failure.cc',
376 ], 389 ],
377 }, 390 },
378 'dependencies': [ 391 'dependencies': [
379 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 392 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
380 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 393 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
381 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 394 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
382 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 395 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
396 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
383 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 397 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
384 'ppapi_test_lib', 398 'ppapi_test_lib',
385 ], 399 ],
386 }, 400 },
387 { 401 {
388 'target_name': 'ppapi_crash_via_exit_call', 402 'target_name': 'ppapi_crash_via_exit_call',
389 'type': 'none', 403 'type': 'none',
390 'variables': { 404 'variables': {
391 'nexe_target': 'ppapi_crash_via_exit_call', 405 'nexe_target': 'ppapi_crash_via_exit_call',
392 'build_newlib': 1, 406 'build_newlib': 1,
393 'build_glibc': 1, 407 'build_glibc': 1,
394 'build_pnacl_newlib': 1, 408 'build_pnacl_newlib': 1,
395 'nexe_destination_dir': 'nacl_test_data', 409 'nexe_destination_dir': 'nacl_test_data',
396 'link_flags': [ 410 'link_flags': [
397 '-lppapi', 411 '-lppapi',
398 '-lppapi_test_lib', 412 '-lppapi_test_lib',
399 '-lplatform', 413 '-lplatform',
400 '-lgio', 414 '-lgio',
401 ], 415 ],
402 'sources': [ 416 'sources': [
403 'crash/ppapi_crash_via_exit_call.cc', 417 'crash/ppapi_crash_via_exit_call.cc',
404 ], 418 ],
405 }, 419 },
406 'dependencies': [ 420 'dependencies': [
407 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 421 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
408 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 422 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
409 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 423 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
410 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 424 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
425 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
411 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 426 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
412 'ppapi_test_lib', 427 'ppapi_test_lib',
413 ], 428 ],
414 }, 429 },
415 { 430 {
416 'target_name': 'ppapi_crash_in_callback', 431 'target_name': 'ppapi_crash_in_callback',
417 'type': 'none', 432 'type': 'none',
418 'variables': { 433 'variables': {
419 'nexe_target': 'ppapi_crash_in_callback', 434 'nexe_target': 'ppapi_crash_in_callback',
420 'build_newlib': 1, 435 'build_newlib': 1,
421 'build_glibc': 1, 436 'build_glibc': 1,
422 'build_pnacl_newlib': 1, 437 'build_pnacl_newlib': 1,
423 'nexe_destination_dir': 'nacl_test_data', 438 'nexe_destination_dir': 'nacl_test_data',
424 'link_flags': [ 439 'link_flags': [
425 '-lppapi', 440 '-lppapi',
426 '-lppapi_test_lib', 441 '-lppapi_test_lib',
427 '-lplatform', 442 '-lplatform',
428 '-lgio', 443 '-lgio',
429 ], 444 ],
430 'sources': [ 445 'sources': [
431 'crash/ppapi_crash_in_callback.cc', 446 'crash/ppapi_crash_in_callback.cc',
432 ], 447 ],
433 }, 448 },
434 'dependencies': [ 449 'dependencies': [
435 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 450 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
436 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 451 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
437 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 452 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
438 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 453 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
454 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
439 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 455 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
440 'ppapi_test_lib', 456 'ppapi_test_lib',
441 ], 457 ],
442 }, 458 },
443 { 459 {
444 'target_name': 'ppapi_crash_off_main_thread', 460 'target_name': 'ppapi_crash_off_main_thread',
445 'type': 'none', 461 'type': 'none',
446 'variables': { 462 'variables': {
447 'nexe_target': 'ppapi_crash_off_main_thread', 463 'nexe_target': 'ppapi_crash_off_main_thread',
448 'build_newlib': 1, 464 'build_newlib': 1,
449 'build_glibc': 1, 465 'build_glibc': 1,
450 'build_pnacl_newlib': 1, 466 'build_pnacl_newlib': 1,
451 'nexe_destination_dir': 'nacl_test_data', 467 'nexe_destination_dir': 'nacl_test_data',
452 'link_flags': [ 468 'link_flags': [
453 '-lppapi', 469 '-lppapi',
454 '-lppapi_test_lib', 470 '-lppapi_test_lib',
455 '-lplatform', 471 '-lplatform',
456 '-lgio', 472 '-lgio',
457 ], 473 ],
458 'sources': [ 474 'sources': [
459 'crash/ppapi_crash_off_main_thread.cc', 475 'crash/ppapi_crash_off_main_thread.cc',
460 ], 476 ],
461 }, 477 },
462 'dependencies': [ 478 'dependencies': [
463 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 479 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
464 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 480 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
465 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 481 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
466 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 482 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
483 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
467 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 484 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
468 'ppapi_test_lib', 485 'ppapi_test_lib',
469 ], 486 ],
470 }, 487 },
471 { 488 {
472 'target_name': 'ppapi_crash_ppapi_off_main_thread', 489 'target_name': 'ppapi_crash_ppapi_off_main_thread',
473 'type': 'none', 490 'type': 'none',
474 'variables': { 491 'variables': {
475 'nexe_target': 'ppapi_crash_ppapi_off_main_thread', 492 'nexe_target': 'ppapi_crash_ppapi_off_main_thread',
476 'build_newlib': 1, 493 'build_newlib': 1,
477 'build_glibc': 1, 494 'build_glibc': 1,
478 'build_pnacl_newlib': 1, 495 'build_pnacl_newlib': 1,
479 'nexe_destination_dir': 'nacl_test_data', 496 'nexe_destination_dir': 'nacl_test_data',
480 'link_flags': [ 497 'link_flags': [
481 '-lppapi', 498 '-lppapi',
482 '-lppapi_test_lib', 499 '-lppapi_test_lib',
483 '-lplatform', 500 '-lplatform',
484 '-lgio', 501 '-lgio',
485 ], 502 ],
486 'sources': [ 503 'sources': [
487 'crash/ppapi_crash_ppapi_off_main_thread.cc', 504 'crash/ppapi_crash_ppapi_off_main_thread.cc',
488 ], 505 ],
489 }, 506 },
490 'dependencies': [ 507 'dependencies': [
491 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 508 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
492 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 509 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
493 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 510 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
494 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 511 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
512 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
495 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 513 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
496 'ppapi_test_lib', 514 'ppapi_test_lib',
497 ], 515 ],
498 }, 516 },
499 { 517 {
500 'target_name': 'pm_redir_test', 518 'target_name': 'pm_redir_test',
501 'type': 'none', 519 'type': 'none',
502 'variables': { 520 'variables': {
503 'nexe_target': 'pm_redir_test', 521 'nexe_target': 'pm_redir_test',
504 'build_newlib': 1, 522 'build_newlib': 1,
(...skipping 10 matching lines...) Expand all
515 ], 533 ],
516 'test_files': [ 534 'test_files': [
517 'postmessage_redir/pm_redir_test.html', 535 'postmessage_redir/pm_redir_test.html',
518 ], 536 ],
519 }, 537 },
520 'dependencies': [ 538 'dependencies': [
521 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 539 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
522 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 540 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
523 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 541 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
524 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 542 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
543 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
525 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 544 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
526 ], 545 ],
527 }, 546 },
528 { 547 {
529 'target_name': 'pm_manifest_file', 548 'target_name': 'pm_manifest_file',
530 'type': 'none', 549 'type': 'none',
531 'variables': { 550 'variables': {
532 'nexe_target': 'pm_manifest_file', 551 'nexe_target': 'pm_manifest_file',
533 'build_newlib': 1, 552 'build_newlib': 1,
534 'build_glibc': 1, 553 'build_glibc': 1,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 # converted. 725 # converted.
707 'irt_exception/irt_exception_test.html', 726 'irt_exception/irt_exception_test.html',
708 ], 727 ],
709 }, 728 },
710 'dependencies': [ 729 'dependencies': [
711 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 730 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
712 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 731 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
713 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 732 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
714 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib', 733 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_lib',
715 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 734 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
735 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
716 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 736 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
717 'ppapi_test_lib', 737 'ppapi_test_lib',
718 ], 738 ],
719 'conditions': [ 739 'conditions': [
720 ['target_arch=="ia32" and OS=="linux"', { 740 ['target_arch=="ia32" and OS=="linux"', {
721 # Enable nonsfi testing only on ia32-linux environment. 741 # Enable nonsfi testing only on ia32-linux environment.
722 'variables': { 742 'variables': {
723 'enable_x86_32_nonsfi': 1, 743 'enable_x86_32_nonsfi': 1,
724 }, 744 },
725 }], 745 }],
(...skipping 23 matching lines...) Expand all
749 'nameservice/pm_nameservice_test.cc', 769 'nameservice/pm_nameservice_test.cc',
750 ], 770 ],
751 'test_files': [ 771 'test_files': [
752 'nameservice/pm_nameservice_test.html', 772 'nameservice/pm_nameservice_test.html',
753 ], 773 ],
754 }, 774 },
755 'dependencies': [ 775 'dependencies': [
756 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 776 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
757 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 777 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
758 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 778 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
779 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
759 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib', 780 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
760 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 781 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
761 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 782 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
762 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib', 783 '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc_lib',
763 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 784 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
764 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib', 785 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref_lib',
765 'nacl_ppapi_util', 786 'nacl_ppapi_util',
766 ], 787 ],
767 }, 788 },
768 { 789 {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 ], 1018 ],
998 'test_files': [ 1019 'test_files': [
999 'ppapi/ppb_core/ppapi_ppb_core.html', 1020 'ppapi/ppb_core/ppapi_ppb_core.html',
1000 ], 1021 ],
1001 }, 1022 },
1002 'dependencies': [ 1023 'dependencies': [
1003 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 1024 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
1004 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 1025 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
1005 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 1026 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
1006 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 1027 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
1028 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
1007 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 1029 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
1008 'ppapi_test_lib', 1030 'ppapi_test_lib',
1009 ], 1031 ],
1010 }, 1032 },
1011 { 1033 {
1012 'target_name': 'ppapi_ppb_instance', 1034 'target_name': 'ppapi_ppb_instance',
1013 'type': 'none', 1035 'type': 'none',
1014 'variables': { 1036 'variables': {
1015 'nexe_target': 'ppapi_ppb_instance', 1037 'nexe_target': 'ppapi_ppb_instance',
1016 'build_newlib': 1, 1038 'build_newlib': 1,
(...skipping 11 matching lines...) Expand all
1028 ], 1050 ],
1029 'test_files': [ 1051 'test_files': [
1030 'ppapi/ppb_instance/ppapi_ppb_instance.html', 1052 'ppapi/ppb_instance/ppapi_ppb_instance.html',
1031 ], 1053 ],
1032 }, 1054 },
1033 'dependencies': [ 1055 'dependencies': [
1034 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 1056 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
1035 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 1057 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
1036 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 1058 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
1037 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 1059 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
1060 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
1038 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 1061 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
1039 'ppapi_test_lib', 1062 'ppapi_test_lib',
1040 ], 1063 ],
1041 }, 1064 },
1042 { 1065 {
1043 'target_name': 'ppapi_ppp_instance', 1066 'target_name': 'ppapi_ppp_instance',
1044 'type': 'none', 1067 'type': 'none',
1045 'variables': { 1068 'variables': {
1046 'nexe_target': 'ppapi_ppp_instance', 1069 'nexe_target': 'ppapi_ppp_instance',
1047 'build_newlib': 1, 1070 'build_newlib': 1,
(...skipping 12 matching lines...) Expand all
1060 'test_files': [ 1083 'test_files': [
1061 'ppapi/ppp_instance/ppapi_ppp_instance.html', 1084 'ppapi/ppp_instance/ppapi_ppp_instance.html',
1062 'ppapi/ppp_instance/ppapi_ppp_instance.js', 1085 'ppapi/ppp_instance/ppapi_ppp_instance.js',
1063 ], 1086 ],
1064 }, 1087 },
1065 'dependencies': [ 1088 'dependencies': [
1066 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 1089 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
1067 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 1090 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
1068 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 1091 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
1069 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', 1092 '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
1093 '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shi m.gyp:aot',
1070 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', 1094 '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
1071 'ppapi_test_lib', 1095 'ppapi_test_lib',
1072 ], 1096 ],
1073 }, 1097 },
1074 ], 1098 ],
1075 'conditions': [ 1099 'conditions': [
1076 ['target_arch!="arm"', { 1100 ['target_arch!="arm"', {
1077 # Source file does not have asm for ARM. 1101 # Source file does not have asm for ARM.
1078 'targets': [ 1102 'targets': [
1079 { 1103 {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 'files': [ 1248 'files': [
1225 '>@(test_files)', 1249 '>@(test_files)',
1226 ], 1250 ],
1227 }, 1251 },
1228 ], 1252 ],
1229 }, 1253 },
1230 ], 1254 ],
1231 }], 1255 }],
1232 ], 1256 ],
1233 } 1257 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698