Bug 1380118 - aom: Filter out CONFIG_EXT_PARTITION_TYPES. r?kinetik,froydnj
aom_dsp_rtcd_defs.pl checks only whether this key is present
in the config, not whether it is set to true or not. Our script
sets CONFIG_FOO=no for disabled options, while the upstream
build system omits them, resulting in extra symbol declarations
the build will never define.
Work around this by stripping the offending disabled config key
if it is disabled.
MozReview-Commit-ID: IyVDO2G3s3L
--- a/media/libaom/lint_config.sh
+++ b/media/libaom/lint_config.sh
@@ -99,14 +99,17 @@ fi
if [ "$print_final" = "no" ]; then
exit
fi
# Do some additional filter to make libvpx happy.
combined_config="$(echo "$combined_config" | grep -v ARCH_X86=no)"
combined_config="$(echo "$combined_config" | grep -v ARCH_X86_64=no)"
+# aom_dsp_rtcd_defs.h checks for definition here, not value.
+combined_config="$(echo "$combined_config" | grep -v CONFIG_EXT_PARTITION_TYPES=no)"
+
# Print out the unique configurations.
if [ -n "$out_file" ]; then
echo "$combined_config" | sort | uniq > $out_file
else
echo "$combined_config" | sort | uniq
fi
