Update aom to slightly newer commit ID

4 files changed, 4 insertions, 48 deletions

diff --git a/third_party/aom/build/make/Android.mk b/third_party/aom/build/make/Android.mk
index 6757b1f59..e50faef92 100644
--- a/third_party/aom/build/make/Android.mk
+++ b/third_party/aom/build/make/Android.mk
@@ -43,10 +43,6 @@
 # Configuring with --disable-runtime-cpu-detect --disable-neon \
 #     --disable-neon-asm
 # will remove any NEON dependency.
-
-# To change to building armeabi, run ./libaom/configure again, but with
-# --target=armv6-android-gcc and modify the Application.mk file to
-# set APP_ABI := armeabi
 #
 # Running ndk-build will build libaom and include it in your project.
 #
@@ -61,9 +57,6 @@ ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL)
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   include $(CONFIG_DIR)libs-armv7-android-gcc.mk
   LOCAL_ARM_MODE := arm
-else ifeq  ($(TARGET_ARCH_ABI),armeabi)
-  include $(CONFIG_DIR)libs-armv6-android-gcc.mk
-  LOCAL_ARM_MODE := arm
 else ifeq  ($(TARGET_ARCH_ABI),arm64-v8a)
   include $(CONFIG_DIR)libs-armv8-android-gcc.mk
   LOCAL_ARM_MODE := arm
diff --git a/third_party/aom/build/make/configure.sh b/third_party/aom/build/make/configure.sh
index 4ece17aee..b18173b82 100644
--- a/third_party/aom/build/make/configure.sh
+++ b/third_party/aom/build/make/configure.sh
@@ -687,9 +687,6 @@ process_common_toolchain() {
       aarch64*)
         tgt_isa=arm64
         ;;
-      armv6*)
-        tgt_isa=armv6
-        ;;
       armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
         tgt_isa=armv7
         float_abi=hard
@@ -898,37 +895,6 @@ process_common_toolchain() {
           if disabled neon && enabled neon_asm; then
             die "Disabling neon while keeping neon-asm is not supported"
           fi
-          case ${toolchain} in
-            # Apple iOS SDKs no longer support armv6 as of the version 9
-            # release (coincides with release of Xcode 7). Only enable media
-            # when using earlier SDK releases.
-            *-darwin*)
-              if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then
-                soft_enable media
-              else
-                soft_disable media
-                RTCD_OPTIONS="${RTCD_OPTIONS}--disable-media "
-              fi
-              ;;
-            *)
-              soft_enable media
-              ;;
-          esac
-          ;;
-        armv6)
-          case ${toolchain} in
-            *-darwin*)
-              if [ "$(show_darwin_sdk_major_version iphoneos)" -lt 9 ]; then
-                soft_enable media
-              else
-                die "Your iOS SDK does not support armv6."
-              fi
-              ;;
-            *)
-              soft_enable media
-              ;;
-          esac
-          ;;
       esac
 
       asm_conversion_cmd="cat"
diff --git a/third_party/aom/build/make/rtcd.pl b/third_party/aom/build/make/rtcd.pl
index 354ae5176..7add5a036 100755
--- a/third_party/aom/build/make/rtcd.pl
+++ b/third_party/aom/build/make/rtcd.pl
@@ -382,12 +382,8 @@ if ($opts{arch} eq 'x86') {
   }
   close CONFIG_FILE;
   mips;
-} elsif ($opts{arch} eq 'armv6') {
-  @ALL_ARCHS = filter(qw/media/);
-  arm;
 } elsif ($opts{arch} =~ /armv7\w?/) {
-  @ALL_ARCHS = filter(qw/media neon_asm neon/);
-  @REQUIRES = filter(keys %required ? keys %required : qw/media/);
+  @ALL_ARCHS = filter(qw/neon_asm neon/);
   &require(@REQUIRES);
   arm;
 } elsif ($opts{arch} eq 'armv8' || $opts{arch} eq 'arm64' ) {
diff --git a/third_party/aom/build/make/version.sh b/third_party/aom/build/make/version.sh
index c0eef9f58..2a7090e4d 100755
--- a/third_party/aom/build/make/version.sh
+++ b/third_party/aom/build/make/version.sh
@@ -28,13 +28,14 @@ if [ -e "${source_path}/.git" ]; then
     # Source Path is a git working copy. Check for local modifications.
     # Note that git submodules may have a file as .git, not a directory.
     export GIT_DIR="${source_path}/.git"
-    git_version_id=`git describe --match=v[0-9]* 2>/dev/null`
+    git_version_id=$(git describe --match=v[0-9]* 2>/dev/null)
 fi
 
 changelog_version=""
 for p in "${source_path}" "${source_path}/.."; do
     if [ -z "$git_version_id" -a -f "${p}/CHANGELOG" ]; then
-        changelog_version=`head -n1 "${p}/CHANGELOG" | awk '{print $2}'`
+        changelog_version=$(grep -m 1 " v[0-9]" "${p}/CHANGELOG" \
+            | awk '{print $2}')
         changelog_version="${changelog_version}"
         break
     fi