| OLD | NEW |
| 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 'variables': { | 5 'variables': { |
| 6 'libvpx_build_vp9%': 1, | 6 'libvpx_build_vp9%': 1, |
| 7 'libvpx_source%': 'source/libvpx', | 7 'libvpx_source%': 'source/libvpx', |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['os_posix==1', { | 9 ['os_posix==1', { |
| 10 'asm_obj_extension': 'o', | 10 'asm_obj_extension': 'o', |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 'include_dirs': [ 'include' ], | 388 'include_dirs': [ 'include' ], |
| 389 }], | 389 }], |
| 390 ], | 390 ], |
| 391 }, | 391 }, |
| 392 { | 392 { |
| 393 # A library that contains assembly offsets needed. | 393 # A library that contains assembly offsets needed. |
| 394 'target_name': 'libvpx_asm_offsets_vp8', | 394 'target_name': 'libvpx_asm_offsets_vp8', |
| 395 'type': 'static_library', | 395 'type': 'static_library', |
| 396 'android_unmangled_name': 1, | 396 'android_unmangled_name': 1, |
| 397 'hard_dependency': 1, | 397 'hard_dependency': 1, |
| 398 'product_dir': '<(shared_generated_dir)', |
| 398 'include_dirs': [ | 399 'include_dirs': [ |
| 399 'source/config/<(OS_CATEGORY)/<(target_arch_full)', | 400 'source/config/<(OS_CATEGORY)/<(target_arch_full)', |
| 400 'source/config', | 401 'source/config', |
| 401 '<(libvpx_source)', | 402 '<(libvpx_source)', |
| 402 ], | 403 ], |
| 403 'conditions': [ | 404 'conditions': [ |
| 404 ['asan==1', { | 405 ['asan==1', { |
| 405 'cflags!': [ '-fsanitize=address' ], | 406 'cflags!': [ '-fsanitize=address' ], |
| 406 'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] }, | 407 'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] }, |
| 407 'ldflags!': [ '-fsanitize=address' ], | 408 'ldflags!': [ '-fsanitize=address' ], |
| (...skipping 14 matching lines...) Expand all Loading... |
| 422 ], | 423 ], |
| 423 }, | 424 }, |
| 424 { | 425 { |
| 425 # A library that contains assembly offsets needed. | 426 # A library that contains assembly offsets needed. |
| 426 # TODO(fgalligan): Merge libvpx_asm_offsets_vpx_scale into | 427 # TODO(fgalligan): Merge libvpx_asm_offsets_vpx_scale into |
| 427 # libvpx_asm_offsets. | 428 # libvpx_asm_offsets. |
| 428 'target_name': 'libvpx_asm_offsets_vpx_scale', | 429 'target_name': 'libvpx_asm_offsets_vpx_scale', |
| 429 'type': 'static_library', | 430 'type': 'static_library', |
| 430 'android_unmangled_name': 1, | 431 'android_unmangled_name': 1, |
| 431 'hard_dependency': 1, | 432 'hard_dependency': 1, |
| 433 'product_dir': '<(shared_generated_dir)', |
| 432 'include_dirs': [ | 434 'include_dirs': [ |
| 433 'source/config/<(OS_CATEGORY)/<(target_arch_full)', | 435 'source/config/<(OS_CATEGORY)/<(target_arch_full)', |
| 434 'source/config', | 436 'source/config', |
| 435 '<(libvpx_source)', | 437 '<(libvpx_source)', |
| 436 ], | 438 ], |
| 437 'conditions': [ | 439 'conditions': [ |
| 438 ['asan==1', { | 440 ['asan==1', { |
| 439 'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ], | 441 'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ], |
| 440 'xcode_settings': { | 442 'xcode_settings': { |
| 441 'OTHER_CFLAGS!': [ '-faddress-sanitizer','-fsanitize=address' ], | 443 'OTHER_CFLAGS!': [ '-faddress-sanitizer','-fsanitize=address' ], |
| (...skipping 11 matching lines...) Expand all Loading... |
| 453 # This target is a hard dependency because the generated .asm files | 455 # This target is a hard dependency because the generated .asm files |
| 454 # are needed all assembly optimized files in libvpx. | 456 # are needed all assembly optimized files in libvpx. |
| 455 'target_name': 'gen_asm_offsets_vp8', | 457 'target_name': 'gen_asm_offsets_vp8', |
| 456 'type': 'none', | 458 'type': 'none', |
| 457 'hard_dependency': 1, | 459 'hard_dependency': 1, |
| 458 'dependencies': [ | 460 'dependencies': [ |
| 459 'libvpx_asm_offsets_vp8', | 461 'libvpx_asm_offsets_vp8', |
| 460 'libvpx_obj_int_extract#host', | 462 'libvpx_obj_int_extract#host', |
| 461 ], | 463 ], |
| 462 'variables' : { | 464 'variables' : { |
| 463 'unpack_lib' : '', | 465 'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vp8.a', |
| 464 'output_format':'', | 466 'output_format':'', |
| 465 'output_dir': '<(shared_generated_dir)', | 467 'output_dir': '<(shared_generated_dir)', |
| 466 'conditions' : [ | 468 'conditions' : [ |
| 467 ['android_webview_build==1', { | 469 ['android_webview_build==1', { |
| 468 # pass the empty string for 3rd and 4th arguments of | 470 # pass the empty string for 3rd and 4th arguments of |
| 469 # intermediates-dir-for macro. | 471 # intermediates-dir-for macro. |
| 470 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRAR
IES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a', | 472 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRAR
IES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a', |
| 471 }], | 473 }], |
| 472 ['OS=="mac" or OS=="ios"', { | |
| 473 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a', | |
| 474 }], | |
| 475 ['OS!="win" and OS!="mac" and OS!="ios"', { | |
| 476 # <(LIB_DIR) not defined for "win". | |
| 477 'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8
.a', | |
| 478 }], | |
| 479 ['(target_arch=="arm" or target_arch=="armv7")', { | 474 ['(target_arch=="arm" or target_arch=="armv7")', { |
| 480 'output_format': 'gas', | 475 'output_format': 'gas', |
| 481 }, { | 476 }, { |
| 482 'output_format': 'rvds', | 477 'output_format': 'rvds', |
| 483 }], | 478 }], |
| 484 ], | 479 ], |
| 485 }, | 480 }, |
| 486 'conditions': [ | 481 'conditions': [ |
| 487 ['OS=="win"', { | 482 ['OS=="win"', { |
| 488 'variables': { | 483 'variables': { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 # This target is a hard dependency because the generated .asm files | 526 # This target is a hard dependency because the generated .asm files |
| 532 # are needed all assembly optimized files in libvpx. | 527 # are needed all assembly optimized files in libvpx. |
| 533 'target_name': 'gen_asm_offsets_vpx_scale', | 528 'target_name': 'gen_asm_offsets_vpx_scale', |
| 534 'type': 'none', | 529 'type': 'none', |
| 535 'hard_dependency': 1, | 530 'hard_dependency': 1, |
| 536 'dependencies': [ | 531 'dependencies': [ |
| 537 'libvpx_asm_offsets_vpx_scale', | 532 'libvpx_asm_offsets_vpx_scale', |
| 538 'libvpx_obj_int_extract#host', | 533 'libvpx_obj_int_extract#host', |
| 539 ], | 534 ], |
| 540 'variables' : { | 535 'variables' : { |
| 541 'unpack_lib' : '', | 536 'unpack_lib' : '<(shared_generated_dir)/libvpx_asm_offsets_vpx_scale.a', |
| 542 'output_format':'', | 537 'output_format':'', |
| 543 'output_dir': '<(shared_generated_dir)', | 538 'output_dir': '<(shared_generated_dir)', |
| 544 'conditions' : [ | 539 'conditions' : [ |
| 545 ['android_webview_build==1', { | 540 ['android_webview_build==1', { |
| 546 # pass the empty string for 3rd and 4th arguments of | 541 # pass the empty string for 3rd and 4th arguments of |
| 547 # intermediates-dir-for macro. | 542 # intermediates-dir-for macro. |
| 548 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRAR
IES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_sc
ale.a', | 543 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRAR
IES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_sc
ale.a', |
| 549 }], | 544 }], |
| 550 ['OS=="mac" or OS=="ios"', { | |
| 551 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vpx_scale.a', | |
| 552 }], | |
| 553 ['OS!="win" and OS!="mac" and OS!="ios"', { | |
| 554 # <(LIB_DIR) not defined for "win". | |
| 555 'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx
_scale.a', | |
| 556 }], | |
| 557 ['(target_arch=="arm" or target_arch=="armv7")', { | 545 ['(target_arch=="arm" or target_arch=="armv7")', { |
| 558 'output_format': 'gas', | 546 'output_format': 'gas', |
| 559 }, { | 547 }, { |
| 560 'output_format': 'rvds', | 548 'output_format': 'rvds', |
| 561 }], | 549 }], |
| 562 ], | 550 ], |
| 563 }, | 551 }, |
| 564 'conditions': [ | 552 'conditions': [ |
| 565 ['OS=="win"', { | 553 ['OS=="win"', { |
| 566 'variables': { | 554 'variables': { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 # Need this otherwise gyp won't run the rule on them. | 586 # Need this otherwise gyp won't run the rule on them. |
| 599 'sources': [ | 587 'sources': [ |
| 600 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', | 588 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', |
| 601 ], | 589 ], |
| 602 }], | 590 }], |
| 603 ], | 591 ], |
| 604 'includes': ['obj_int_extract.gypi'], | 592 'includes': ['obj_int_extract.gypi'], |
| 605 }, | 593 }, |
| 606 ], | 594 ], |
| 607 } | 595 } |
| OLD | NEW |