Make chromium and chromiumos for arm use the same options and turn off Neon.

BUG=30817
TEST=build chromiumos for arm.  This should build/link.  Previously there were link errors.

Review URL: http://codereview.chromium.org/543159

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36953 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 11 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 07f53afb..a6ace12 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -256,6 +256,9 @@
             }],  # target_arch=="arm" 
             ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
               'sources': [
+	        # TODO(fbarchard): dsputil_neon code should be used by chromium
+		# for ogg, but with h264 references only if CONFIG_H264_DECODER
+		# is enabled.
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon_s.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S',
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
index 59f09b8..387aecc 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp'"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp'"
 #define FFMPEG_DATADIR "/tmp/dummy/share/ffmpeg"
 #define CC_TYPE "gcc"
 #define CC_VERSION __VERSION__
@@ -49,7 +49,7 @@
 #define HAVE_OS2THREADS 0
 #define HAVE_PTHREADS 1
 #define HAVE_W32THREADS 0
-#define HAVE_ALSA_ASOUNDLIB_H 0
+#define HAVE_ALSA_ASOUNDLIB_H 1
 #define HAVE_ALTIVEC_H 0
 #define HAVE_ARPA_INET_H 0
 #define HAVE_ATTRIBUTE_PACKED 1
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
index acebb257..5d8ee97 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp'"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=softfp'"
 #define FFMPEG_DATADIR "/tmp/dummy/share/ffmpeg"
 #define ARCH_ALPHA 0
 #define ARCH_ARM 1
@@ -23,13 +23,13 @@
 #define HAVE_AMD3DNOWEXT 0
 #define HAVE_ARMV5TE 1
 #define HAVE_ARMV6 1
-#define HAVE_ARMV6T2 0
+#define HAVE_ARMV6T2 1
 #define HAVE_ARMVFP 1
 #define HAVE_IWMMXT 0
 #define HAVE_MMI 0
 #define HAVE_MMX 0
 #define HAVE_MMX2 0
-#define HAVE_NEON 1
+#define HAVE_NEON 0
 #define HAVE_PPC4XX 0
 #define HAVE_SSE 0
 #define HAVE_SSSE3 0
@@ -55,10 +55,10 @@
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
 #define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 0
 #define HAVE_FAST_64BIT 0
 #define HAVE_FAST_CMOV 0
-#define HAVE_FAST_UNALIGNED 1
+#define HAVE_FAST_UNALIGNED 0
 #define HAVE_FORK 1
 #define HAVE_GETHRTIME 0
 #define HAVE_GETPROCESSTIMES 0
@@ -71,13 +71,13 @@
 #define HAVE_LLRINT 1
 #define HAVE_LRINT 1
 #define HAVE_LRINTF 1
-#define HAVE_LZO1X_999_COMPRESS 1
+#define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
 #define HAVE_MALLOC_H 1
 #define HAVE_MEMALIGN 1
 #define HAVE_MKSTEMP 1
-#define HAVE_PLD 0
+#define HAVE_PLD 1
 #define HAVE_POSIX_MEMALIGN 1
 #define HAVE_PPC64 0
 #define HAVE_ROUND 1
@@ -93,7 +93,7 @@
 #define HAVE_SYS_SELECT_H 1
 #define HAVE_SYS_SOUNDCARD_H 1
 #define HAVE_SYS_VIDEOIO_H 0
-#define HAVE_TEN_OPERANDS 1
+#define HAVE_TEN_OPERANDS 0
 #define HAVE_TERMIOS_H 1
 #define HAVE_THREADS 1
 #define HAVE_TRUNCF 1
@@ -150,7 +150,7 @@
 #define CONFIG_MDCT 1
 #define CONFIG_MEMALIGN_HACK 0
 #define CONFIG_MLIB 0
-#define CONFIG_MPEGAUDIO_HP 1
+#define CONFIG_MPEGAUDIO_HP 0
 #define CONFIG_NETWORK 0
 #define CONFIG_NONFREE 0
 #define CONFIG_PIC 1