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

Commit 51f0d3f5 authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 70555a16 to master 

Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
parents a1f8afa9 70555a16

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,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
@@ -399,7 +399,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 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