commit 51f0d3f58a5c04ee328778bc97e42dc10cfa41ad
author Ying Wang <wangying@google.com> Tue Apr 15 13:55:24 2014 -0700
committer Ying Wang <wangying@google.com> Tue Apr 15 13:55:24 2014 -0700
tree e117392f7399a5e9999ce468475e9644795cf70d
parent a1f8afa930ccaa0241892f25d37325743661755a
parent 70555a1677100326b7cf6d503681e0ef52c82154

resolved conflicts for merge of 70555a16 to master

Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8

core/main.mk

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