commit 9e8b6c429d9d17d8251ae8aa15c6de2420732431
author Ying Wang <wangying@google.com> Wed Oct 02 11:11:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 11:11:13 2013 -0700
tree 639c4d891ddbd78ef4b93b170acab7a71566b8e9
parent 2408479cf9cf9cfe87e464e9b5d2f36143818d37
parent 3d48d9c36b2d2cd696d3ee2656939e77ca5ba950

am 3d48d9c3: Allow to run checkbuild in sdk build.

* commit '3d48d9c36b2d2cd696d3ee2656939e77ca5ba950':
  Allow to run checkbuild in sdk build.

core/main.mk

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