Bug 1380118 - aom: Filter out CONFIG_EXT_PARTITION_TYPES. r=froydnj,kinetik

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

--HG--
extra : rebase_source : a1bb8b285f798464b8d8026c0dd4cd85595ae93d
This commit is contained in:
Ralph Giles 2017-08-11 14:20:11 -07:00
parent a8ba932bc2
commit 8d6c3b9a16

View File

@ -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