Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70555a16 authored Apr 15, 2014 by Ying Wang Committed by Android Git Automerger Apr 15, 2014

am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev

* commit 'fcd22c88':
  Allow to build target-files.zip in sdk build.

parents d954c6b9 fcd22c88

core/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -1295,6 +1295,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)),)

core/main.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,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