| Index: libvpx.gyp
|
| ===================================================================
|
| --- libvpx.gyp (revision 273864)
|
| +++ libvpx.gyp (working copy)
|
| @@ -396,11 +396,6 @@
|
| 'android_unmangled_name': 1,
|
| 'hard_dependency': 1,
|
| 'product_dir': '<(shared_generated_dir)',
|
| - 'conditions' : [
|
| - ['android_webview_build==1', {
|
| - 'product_dir' : '',
|
| - }],
|
| - ],
|
| 'include_dirs': [
|
| 'source/config/<(OS_CATEGORY)/<(target_arch_full)',
|
| 'source/config',
|
| @@ -422,6 +417,9 @@
|
| },
|
| },
|
| }],
|
| + ['android_webview_build==1', {
|
| + 'product_dir' : '',
|
| + }],
|
| ],
|
| 'sources': [
|
| '<(libvpx_source)/vp8/encoder/vp8_asm_enc_offsets.c',
|
| @@ -436,11 +434,6 @@
|
| 'android_unmangled_name': 1,
|
| 'hard_dependency': 1,
|
| 'product_dir': '<(shared_generated_dir)',
|
| - 'conditions' : [
|
| - ['android_webview_build==1', {
|
| - 'product_dir' : '',
|
| - }],
|
| - ],
|
| 'include_dirs': [
|
| 'source/config/<(OS_CATEGORY)/<(target_arch_full)',
|
| 'source/config',
|
| @@ -454,6 +447,9 @@
|
| },
|
| 'ldflags!': [ '-faddress-sanitizer', '-fsanitize=address', ],
|
| }],
|
| + ['android_webview_build==1', {
|
| + 'product_dir' : '',
|
| + }],
|
| ],
|
| 'sources': [
|
| '<(libvpx_source)/vpx_scale/vpx_scale_asm_offsets.c',
|
|
|