Merge branch 'master' into nextgenv2

Change-Id: I6f8b540854ddc78fc4a2a8045b194a888749a3cb

diff --cc test/test.mk
index 277bb845531f2943701c812d6e1e044274bef21a,2487bd2affb4d4819feec6f12f9f7100e0967d20..4104fd7facd56641be007bb73f1fd62155234fcc
--- 1/test/test.mk
--- 2/test/test.mk
+++ b/test/test.mk
@@@ -162,20 -161,20 +161,25 @@@ LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) 
  
  endif # VP9
  
- LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS)    += sad_test.cc
- 
- TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) := test_intra_pred_speed.cc
- TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) += ../md5_utils.h ../md5_utils.c
- 
  ## VP10
+ ifeq ($(CONFIG_VP10),yes)
+ 
+ LIBVPX_TEST_SRCS-yes                    += vp10_inv_txfm_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += vp10_dct_test.cc
- LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm_test.cc
+ 
+ endif # VP10
+ 
+ ## Multi-codec / unconditional whitebox tests.
+ LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_txfm_test.h
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm2d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm2d_test.cc
  
+ TEST_INTRA_PRED_SPEED_SRCS-yes := test_intra_pred_speed.cc
+ TEST_INTRA_PRED_SPEED_SRCS-yes += ../md5_utils.h ../md5_utils.c
+ 
  endif # CONFIG_SHARED
  
  include $(SRC_PATH_BARE)/test/test-data.mk