commit 9f8828b64f0c8c93d484fe078369c64fcc2fd7dd
author johannkoenig@chromium.org <johannkoenig@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Wed Jun 25 04:49:59 2014 +0000
committer johannkoenig@chromium.org <johannkoenig@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Wed Jun 25 04:49:59 2014 +0000
tree e80cd373d41b40c310891153c554090cd664c250
parent ae672fb3ecdaad60ad1c31d8c65827d8eca382e3

Fix Android x86 builds of libvpx

Android previously didn't define rand(). We had a workaround
which used the inline _rand, but they added rand() to android
and removed _rand. So now we call lrand48() which is available
in all versions.

BUG=388490
TBR=tomfinegan@chromium.org

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

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

libvpx.gyp

diff --git a/libvpx.gyp b/libvpx.gyp
index 7121f54..bb5d5f8 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -88,6 +88,17 @@
               '-I', '<(libvpx_source)',
               '-I', '<(shared_generated_dir)', # Generated assembly offsets
             ],
+            # yasm only gets the flags we define. It doesn't inherit any of the
+            # really useful defines that come with a gcc invocation. In this
+            # case, we rely on __ANDROID__ to set 'rand' to 'lrand48'.
+            # Previously we used the builtin _rand but that's gone away.
+            'conditions': [
+              ['OS=="android"', {
+                'yasm_flags': [
+                  '-D', '__ANDROID__',
+                ],
+              }],
+            ],
           },
           'dependencies': [
             'gen_asm_offsets_vp8',