Update libaom vendor scripts to account for upstream changes

3 files changed, 24 insertions, 18 deletions

diff --git a/media/libaom/cmakeparser.py b/media/libaom/cmakeparser.py
index 9a2ee4b850..cb2686a618 100644
--- a/media/libaom/cmakeparser.py
+++ b/media/libaom/cmakeparser.py
@@ -161,6 +161,21 @@ def evaluate(variables, cache_variables, parsed):
                 cache_variables.append(variable)
             except ValueError:
                 variables[variable] = ' '.join(values)
+        # we need to emulate the behavior of these function calls
+        # because we don't support interpreting them directly
+        # see bug 1492292
+        elif command in ['set_aom_config_var', 'set_aom_detect_var']:
+            variable = arguments[0]
+            value = arguments[1]
+            if variable not in variables:
+                variables[variable] = value
+            cache_variables.append(variable)
+        elif command == 'set_aom_option_var':
+            # option vars cannot go into cache_variables
+            variable = arguments[0]
+            value = arguments[2]
+            if variable not in variables:
+                variables[variable] = value
         elif command == 'add_asm_library':
             try:
                 sources.extend(variables[arguments[1]].split(' '))
diff --git a/media/libaom/generate_sources_mozbuild.py b/media/libaom/generate_sources_mozbuild.py
index d3b3891839..a5a75d8bee 100644
--- a/media/libaom/generate_sources_mozbuild.py
+++ b/media/libaom/generate_sources_mozbuild.py
@@ -62,24 +62,14 @@ if __name__ == '__main__':
         'CMAKE_CURRENT_SOURCE_DIR': AOM_DIR,
         'CONFIG_AV1_DECODER': 1,
         'CONFIG_AV1_ENCODER': 0,
-        'CONFIG_BGSPRITE': 0,
-        'CONFIG_CDEF_SINGLEPASS': 0,
-        'CONFIG_CFL': 0,
-        'CONFIG_HASH_ME': 0,
-        'CONFIG_HIGH_BITDEPTH': 0,
+        'CONFIG_COLLECT_INTER_MODE_RD_STATS': 0,
         'CONFIG_INSPECTION': 0,
         'CONFIG_INTERNAL_STATS': 0,
         'CONFIG_LIBYUV': 0,
-        'CONFIG_LOWBITDEPTH': 0,
-        'CONFIG_LV_MAP': 0,
-        'CONFIG_MOTION_VAR': 0,
+        'CONFIG_LOWBITDEPTH': 1,
         'CONFIG_MULTITHREAD': 1,
-        'CONFIG_NCOBMC_ADAPT_WEIGHT': 0,
         'CONFIG_PIC': 0,
-        'CONFIG_PVQ': 0,
-        'CONFIG_UNIT_TESTS': 0,
         'CONFIG_WEBM_IO': 0,
-        'CONFIG_XIPHRC': 0,
         'CMAKE_CURRENT_BINARY_DIR': 'OBJDIR',
         'CMAKE_INSTALL_PREFIX': 'INSTALLDIR',
         'CMAKE_SYSTEM_NAME': 'Linux',
@@ -87,6 +77,7 @@ if __name__ == '__main__':
         'ENABLE_EXAMPLES': 0,
         'ENABLE_TESTS': 0,
         'ENABLE_TOOLS': 0,
+        'ENABLE_DOCS': 0,
         'AOM_TEST_TEST_CMAKE_': 1, #prevent building tests
     }
 
@@ -115,6 +106,8 @@ if __name__ == '__main__':
         variables['INLINE'] = 'inline'
         if cpu == 'x86' and system == 'linux':
             variables['CONFIG_PIC'] = 1
+        if cpu == 'armv7':
+            variables['CONFIG_PIC'] = 1
         if system == 'win' and not arch.startswith('mingw'):
             variables['MSVC'] = 1
 
@@ -124,9 +117,7 @@ if __name__ == '__main__':
 
         # Disable HAVE_UNISTD_H.
         cache_variables.remove('HAVE_UNISTD_H')
-
         write_aom_config(system, arch, variables, cache_variables)
-
         # Currently, the sources are the same for each supported cpu
         # regardless of operating system / compiler. If that changes, we'll
         # have to generate sources for each combination.
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
index a0705863b2..fc12b7230c 100755
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -34,21 +34,21 @@ function gen_rtcd_header {
 
   AOM_CONFIG=$BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_config.h
 
-  $BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
+  $BASE_DIR/$LIBAOM_SRC_DIR/build/cmake/rtcd.pl \
     --arch=$2 \
-    --sym=aom_rtcd $3 \
+    --sym=av1_rtcd $3 \
     --config=$AOM_CONFIG \
     $BASE_DIR/$LIBAOM_SRC_DIR/av1/common/av1_rtcd_defs.pl \
     > $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/av1_rtcd.h
 
-  $BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
+  $BASE_DIR/$LIBAOM_SRC_DIR/build/cmake/rtcd.pl \
     --arch=$2 \
     --sym=aom_scale_rtcd $3 \
     --config=$AOM_CONFIG \
     $BASE_DIR/$LIBAOM_SRC_DIR/aom_scale/aom_scale_rtcd.pl \
     > $BASE_DIR/$LIBAOM_CONFIG_DIR/$1/config/aom_scale_rtcd.h
 
-  $BASE_DIR/$LIBAOM_SRC_DIR/build/make/rtcd.pl \
+  $BASE_DIR/$LIBAOM_SRC_DIR/build/cmake/rtcd.pl \
     --arch=$2 \
     --sym=aom_dsp_rtcd $3 \
     --config=$AOM_CONFIG \