commit 43d524854acf54e7de065d71d649f047a3283210
author Tsu Chiang Chuang <tsu@google.com> Tue Feb 25 10:37:58 2014 -0800
committer Tsu Chiang Chuang <tsu@google.com> Tue Feb 25 10:38:22 2014 -0800
tree 4740bc558a6995bf7e7c45530a54774e58bee4ee
parent c1b2536f635f31777f46e07988e75737b90a75c1

add exception to be able to build emulator_tests in conjunction with the
sdk.

Change-Id: Ic4c63c756c78da97657e08faa5b4b6891b951b03

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index ca10610..1eaf8a6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -398,7 +398,7 @@
 sdk_repo_goal := $(strip $(filter sdk_repo,$(MAKECMDGOALS)))
 MAKECMDGOALS := $(strip $(filter-out sdk_repo,$(MAKECMDGOALS)))
 
-ifneq ($(words $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild,$(MAKECMDGOALS))),1)
+ifneq ($(words $(filter-out $(INTERNAL_MODIFIER_TARGETS) checkbuild emulator_tests,$(MAKECMDGOALS))),1)
 $(error The 'sdk' target may not be specified with any other targets)
 endif