From 6940d0df6cc869c9a2a08526b5d2231235c41f5c Mon Sep 17 00:00:00 2001 From: trav90 Date: Wed, 17 Oct 2018 22:59:33 -0500 Subject: [PATCH] [aom] Filter out CONFIG_EXT_PARTITION_TYPES 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. --- media/libaom/lint_config.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/libaom/lint_config.sh b/media/libaom/lint_config.sh index 1a6c96dfbb..1314b44e94 100755 --- a/media/libaom/lint_config.sh +++ b/media/libaom/lint_config.sh @@ -104,6 +104,9 @@ fi 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