|
Line
Link Here
|
| 0 |
-- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh |
0 |
++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh |
|
Lines 85-90
Link Here
|
| 85 |
HOST_ARCH=x64 |
85 |
HOST_ARCH=x64 |
| 86 |
JOBS=$(grep processor /proc/cpuinfo | wc -l) |
86 |
JOBS=$(grep processor /proc/cpuinfo | wc -l) |
| 87 |
;; |
87 |
;; |
|
|
88 |
Linux\ arm*) |
| 89 |
HOST_OS=linux |
| 90 |
HOST_ARCH=arm |
| 91 |
if (grep neon /proc/cpuinfo) |
| 92 |
then |
| 93 |
TARGET_ARCH=arm-neon |
| 94 |
else |
| 95 |
TARGET_ARCH=arm |
| 96 |
fi |
| 97 |
JOBS=$(grep processor /proc/cpuinfo | wc -l) |
| 98 |
;; |
| 88 |
Darwin\ i386) |
99 |
Darwin\ i386) |
| 89 |
HOST_OS=mac |
100 |
HOST_OS=mac |
| 90 |
HOST_ARCH=ia32 |
101 |
HOST_ARCH=ia32 |
|
Lines 292-297
Link Here
|
| 292 |
add_flag_common --extra-cflags=-m32 |
303 |
add_flag_common --extra-cflags=-m32 |
| 293 |
add_flag_common --extra-ldflags=-m32 |
304 |
add_flag_common --extra-ldflags=-m32 |
| 294 |
elif [ "$TARGET_ARCH" = "arm" ]; then |
305 |
elif [ "$TARGET_ARCH" = "arm" ]; then |
|
|
306 |
|
| 307 |
if [ "$HOST_ARCH" != "arm" ]; then |
| 295 |
# This if-statement essentially is for chroot tegra2. |
308 |
# This if-statement essentially is for chroot tegra2. |
| 296 |
add_flag_common --enable-cross-compile |
309 |
add_flag_common --enable-cross-compile |
| 297 |
|
310 |
|
|
Lines 300-305
Link Here
|
| 300 |
add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
313 |
add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 301 |
add_flag_common --target-os=linux |
314 |
add_flag_common --target-os=linux |
| 302 |
add_flag_common --arch=arm |
315 |
add_flag_common --arch=arm |
|
|
316 |
fi |
| 303 |
|
317 |
|
| 304 |
# TODO(ihf): ARM compile flags are tricky. The final options |
318 |
# TODO(ihf): ARM compile flags are tricky. The final options |
| 305 |
# overriding everything live in chroot /build/*/etc/make.conf |
319 |
# overriding everything live in chroot /build/*/etc/make.conf |
|
Lines 323-332
Link Here
|
| 323 |
add_flag_common --extra-cflags=-mfloat-abi=hard |
337 |
add_flag_common --extra-cflags=-mfloat-abi=hard |
| 324 |
elif [ "$TARGET_ARCH" = "arm-neon" ]; then |
338 |
elif [ "$TARGET_ARCH" = "arm-neon" ]; then |
| 325 |
# This if-statement is for chroot arm-generic. |
339 |
# This if-statement is for chroot arm-generic. |
|
|
340 |
if [ "$HOST_ARCH" != "arm" ]; then |
| 326 |
add_flag_common --enable-cross-compile |
341 |
add_flag_common --enable-cross-compile |
| 327 |
add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
342 |
add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 328 |
add_flag_common --target-os=linux |
343 |
add_flag_common --target-os=linux |
| 329 |
add_flag_common --arch=arm |
344 |
add_flag_common --arch=arm |
|
|
345 |
fi |
| 330 |
add_flag_common --enable-armv6 |
346 |
add_flag_common --enable-armv6 |
| 331 |
add_flag_common --enable-armv6t2 |
347 |
add_flag_common --enable-armv6t2 |
| 332 |
add_flag_common --enable-vfp |
348 |
add_flag_common --enable-vfp |
