Commit 0231e27b authored by Johann Koenig's avatar Johann Koenig
Browse files

Check CONFIG_VP<N> instead of encoder and decoder

If either the encoder or the decoder is enabled, CONFIG_VP<N> 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
parent 180b1804
...@@ -76,7 +76,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes) ...@@ -76,7 +76,7 @@ ifeq ($(CONFIG_VP8_DECODER),yes)
CODEC_DOC_SECTIONS += vp8 vp8_decoder CODEC_DOC_SECTIONS += vp8 vp8_decoder
endif endif
ifneq ($(CONFIG_VP9_ENCODER)$(CONFIG_VP9_DECODER),) ifeq ($(CONFIG_VP9),yes)
include $(SRC_PATH_BARE)/$(VP9_PREFIX) include $(SRC_PATH_BARE)/$(VP9_PREFIX)
endif endif
...@@ -110,7 +110,7 @@ VP9_PREFIX=vp9/ ...@@ -110,7 +110,7 @@ VP9_PREFIX=vp9/
$(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra
# VP10 make file # VP10 make file
ifneq ($(CONFIG_VP10_ENCODER)$(CONFIG_VP10_DECODER),) ifeq ($(CONFIG_VP10),yes)
VP10_PREFIX=vp10/ VP10_PREFIX=vp10/
include $(SRC_PATH_BARE)/$(VP10_PREFIX) include $(SRC_PATH_BARE)/$(VP10_PREFIX)
endif endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment