| 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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 'product_dir': '<(shared_generated_dir)', |
| 399 'conditions' : [ |
| 400 ['android_webview_build==1', { |
| 401 'product_dir' : '', |
| 402 }], |
| 403 ], |
| 399 'include_dirs': [ | 404 'include_dirs': [ |
| 400 'source/config/<(OS_CATEGORY)/<(target_arch_full)', | 405 'source/config/<(OS_CATEGORY)/<(target_arch_full)', |
| 401 'source/config', | 406 'source/config', |
| 402 '<(libvpx_source)', | 407 '<(libvpx_source)', |
| 403 ], | 408 ], |
| 404 'conditions': [ | 409 'conditions': [ |
| 405 ['asan==1', { | 410 ['asan==1', { |
| 406 'cflags!': [ '-fsanitize=address' ], | 411 'cflags!': [ '-fsanitize=address' ], |
| 407 'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] }, | 412 'xcode_settings': { 'OTHER_CFLAGS!': [ '-fsanitize=address' ] }, |
| 408 'ldflags!': [ '-fsanitize=address' ], | 413 'ldflags!': [ '-fsanitize=address' ], |
| (...skipping 15 matching lines...) Expand all Loading... |
| 424 }, | 429 }, |
| 425 { | 430 { |
| 426 # A library that contains assembly offsets needed. | 431 # A library that contains assembly offsets needed. |
| 427 # TODO(fgalligan): Merge libvpx_asm_offsets_vpx_scale into | 432 # TODO(fgalligan): Merge libvpx_asm_offsets_vpx_scale into |
| 428 # libvpx_asm_offsets. | 433 # libvpx_asm_offsets. |
| 429 'target_name': 'libvpx_asm_offsets_vpx_scale', | 434 'target_name': 'libvpx_asm_offsets_vpx_scale', |
| 430 'type': 'static_library', | 435 'type': 'static_library', |
| 431 'android_unmangled_name': 1, | 436 'android_unmangled_name': 1, |
| 432 'hard_dependency': 1, | 437 'hard_dependency': 1, |
| 433 'product_dir': '<(shared_generated_dir)', | 438 'product_dir': '<(shared_generated_dir)', |
| 439 'conditions' : [ |
| 440 ['android_webview_build==1', { |
| 441 'product_dir' : '', |
| 442 }], |
| 443 ], |
| 434 'include_dirs': [ | 444 'include_dirs': [ |
| 435 'source/config/<(OS_CATEGORY)/<(target_arch_full)', | 445 'source/config/<(OS_CATEGORY)/<(target_arch_full)', |
| 436 'source/config', | 446 'source/config', |
| 437 '<(libvpx_source)', | 447 '<(libvpx_source)', |
| 438 ], | 448 ], |
| 439 'conditions': [ | 449 'conditions': [ |
| 440 ['asan==1', { | 450 ['asan==1', { |
| 441 'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ], | 451 'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ], |
| 442 'xcode_settings': { | 452 'xcode_settings': { |
| 443 'OTHER_CFLAGS!': [ '-faddress-sanitizer','-fsanitize=address' ], | 453 'OTHER_CFLAGS!': [ '-faddress-sanitizer','-fsanitize=address' ], |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 # Need this otherwise gyp won't run the rule on them. | 596 # Need this otherwise gyp won't run the rule on them. |
| 587 'sources': [ | 597 'sources': [ |
| 588 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', | 598 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', |
| 589 ], | 599 ], |
| 590 }], | 600 }], |
| 591 ], | 601 ], |
| 592 'includes': ['obj_int_extract.gypi'], | 602 'includes': ['obj_int_extract.gypi'], |
| 593 }, | 603 }, |
| 594 ], | 604 ], |
| 595 } | 605 } |
| OLD | NEW |