commit 5ebe94f9f148693a34bc861ef97a7fff6fc38251
author John Koleszar <jkoleszar@google.com> Sun Dec 23 07:20:10 2012 -0800
committer John Koleszar <jkoleszar@google.com> Wed Dec 26 11:21:09 2012 -0800
tree 0048d41d14362fa178b63197acc4d75d656ba77a
parent 6ee08f3ccf82871963e740f1420655668e3b7ea5

Build fixes to merge vp9-preview into master

Various fixups to resolve issues when building vp9-preview under the more stringent
checks placed on the experimental branch.

Change-Id: I21749de83552e1e75c799003f849e6a0f1a35b07

test/test_libvpx.cc

diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc
index 52a4fb9..5610c26 100644
--- a/test/test_libvpx.cc
+++ b/test/test_libvpx.cc
@@ -9,9 +9,10 @@
  */
 #include <string>
 #include "vpx_config.h"
-#if ARCH_X86 || ARCH_X86_64
 extern "C" {
+#if ARCH_X86 || ARCH_X86_64
 #include "vpx_ports/x86.h"
+#endif
 #if CONFIG_VP8
 extern void vp8_rtcd();
 #endif
@@ -19,7 +20,6 @@
 extern void vp9_rtcd();
 #endif
 }
-#endif
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 static void append_gtest_filter(const char *str) {
@@ -47,12 +47,15 @@
     append_gtest_filter(":-SSE4_1/*");
 #endif
 
+#if !CONFIG_SHARED
+  /* Shared library builds don't support whitebox tests that exercise internal symbols. */
 #if CONFIG_VP8
   vp8_rtcd();
 #endif
 #if CONFIG_VP9
   vp9_rtcd();
 #endif
+#endif
 
   return RUN_ALL_TESTS();
 }