From 0231e27bf0491baa6e8a4bb59d449ab61d2dd606 Mon Sep 17 00:00:00 2001 From: Johann Koenig Date: Fri, 28 Aug 2015 16:18:18 -0700 Subject: [PATCH] Check CONFIG_VP instead of encoder and decoder If either the encoder or the decoder is enabled, CONFIG_VP will be set. This simplifies the conditional and passes the chromium update script when CONFIG_ values are passed in with 'yes' and 'no' values. This was failing because it was checking against empty strings but they are set to 'no' Change-Id: I02ecd557210088ba1458cd0e89eead5666f6597a --- libs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs.mk b/libs.mk index b9d4b2868..811a6e5b9 100644 --- a/libs.mk +++ b/libs.mk @@ -76,7 +76,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes) CODEC_DOC_SECTIONS += vp8 vp8_decoder endif -ifneq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),) +ifeq ($(CONFIG_VP9),yes) VP9_PREFIX=vp9/ include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk endif @@ -110,7 +110,7 @@ VP9_PREFIX=vp9/ $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra # VP10 make file -ifneq ($(CONFIG_VP10_ENCODER)$(CONFIG_VP10_DECODER),) +ifeq ($(CONFIG_VP10),yes) VP10_PREFIX=vp10/ include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk endif -- 2.40.0