From: Makoto Kato <makoto.kt@gmail.com>
Date: Sun, 12 Feb 2012 04:57:13 +0000 (+0900)
Subject: Support Android x86 NDK build
X-Git-Tag: v1.1.0~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7989bb7fe74aa1a3e477b2228e32424376c2c5e9;p=libvpx

Support Android x86 NDK build

On Android NDK, rand() is inlined function.  But, on our SSE optimization,
we need symbol for rand()

Change-Id: I42ab00e3255208ba95d7f9b9a8a3605ff58da8e1
---

diff --git a/vp8/common/x86/postproc_x86.c b/vp8/common/x86/postproc_x86.c
new file mode 100644
index 000000000..a25921bee
--- /dev/null
+++ b/vp8/common/x86/postproc_x86.c
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/* On Android NDK, rand is inlined function, but postproc needs rand symbol */
+#if defined(__ANDROID__)
+#define rand __rand
+#include <stdlib.h>
+#undef rand
+
+extern int rand(void)
+{
+  return __rand();
+}
+#endif
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk
index d3d82e2f4..b2db4ce5b 100644
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -93,6 +93,7 @@ VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm
 VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm
 VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm
 ifeq ($(CONFIG_POSTPROC),yes)
+VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/postproc_x86.c
 VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/postproc_mmx.asm
 VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
 endif