commit 3d48d9c36b2d2cd696d3ee2656939e77ca5ba950
author Ying Wang <wangying@google.com> Wed Jun 26 17:56:08 2013 -0700
committer Ying Wang <wangying@google.com> Wed Oct 02 18:09:10 2013 +0000
tree 54f71c0c7781f3e9cdb9f1fb39a06b98e6448daf
parent fe66c390fb4068b380068a99311fdc42ae56dfa6

Allow to run checkbuild in sdk build.

Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
(cherry picked from commit fcec57a1165dc78ca2630c017dd95bddce31e55a)

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