Fix Android build.

source/libvpx/vpx_ports/arm_cpudetect.c

 /*
  *  Copyright (c) 2010 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.
  */
 
@@ skipping 83 matching lines @@
         }
     }
 #endif
 #endif
 #endif
     return flags & mask;
 }
 
 #elif defined(__linux__)
 #if defined(__ANDROID__)
-#include <cpu-features.h>
+#include <machine/cpu-features.h>

[Alpha Left Google, 2012/11/19 18:46:33]

It's better that we upstream this change to libvpx, e.g.

#if defined(CHROMIUM)
#include <machine/cpu-features.h>
#else
#include <cpu-features.h>
#endif

There will be frequent updates to the source/ directory and your change will be
overwritten.

[wjia(left Chromium), 2012/11/19 19:41:48]

Done with CHROMIUM_BUILD flag. I will ask Johann to upstream this change.

 
 int arm_cpu_caps(void)
 {
     int flags;
     int mask;
     uint64_t features;
     if (!arm_cpu_env_flags(&flags))
     {
         return flags;
     }
@@ skipping 94 matching lines @@
 #if defined(HAVE_NEON)
     flags |= HAS_NEON;
 #endif
     return flags & mask;
 }
 
 #else
 #error "--enable-runtime-cpu-detect selected, but no CPU detection method " \
  "available for your platform. Reconfigure without --enable-runtime-cpu-detect."
 #endif