commit b8e08a31dffcffa63fe88ad0bcf91ef32077d683
author fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Fri May 30 15:14:51 2014 +0000
committer fgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Fri May 30 15:14:51 2014 +0000
tree b1070257ff9828b609cab4543bb22c68e387a9c1
parent 0af2b89c9011c96c180faed1416eec76c6ead930

libvpx: Testing android web view fix.

BUG=377062
TBR=tomfinegan@chromium.org

Review URL: https://codereview.chromium.org/305133003

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@273843 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

libvpx.gyp

diff --git a/libvpx.gyp b/libvpx.gyp
index f31b5bd..9a264c1 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -396,6 +396,11 @@
       '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',
@@ -431,6 +436,11 @@
       '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',