From 4709d7c3a5239d9d073a7d536385596ea18981a9 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 14 Apr 2014 17:25:43 -0700
Subject: [PATCH] Allow to build target-files.zip in sdk build.

and put the target-files.zip on the build server.

Bug: 13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
---
 core/Makefile | 3 +++
 core/main.mk  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/Makefile b/core/Makefile
index 78e8db56f6..5c3e1eee5f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1288,6 +1288,9 @@ endif
 .PHONY: target-files-package
 target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
 
+ifneq ($(filter $(MAKECMDGOALS),target-files-package),)
+$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))
+endif
 
 ifneq ($(TARGET_PRODUCT),sdk)
 ifeq ($(filter generic%,$(TARGET_DEVICE)),)
diff --git a/core/main.mk b/core/main.mk
index 5d46c98d47..bb81a9ad12 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -391,7 +391,7 @@ ifdef is_sdk_build
 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 target-files-package,$(MAKECMDGOALS))),1)
 $(error The 'sdk' target may not be specified with any other targets)
 endif