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

Unified Diff: libvpx.gyp

Issue 304223008: libvpx: Testing android web view fix. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« 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