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

Commit 6f8e3da0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove the APP-* goal"

parents 98efd829 01ab167a

core/ninja_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ endif 
KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh



# Modifier goals we don't need to pass to Ninja.

NINJA_EXCLUDE_GOALS := all APP-% PRODUCT-%

NINJA_EXCLUDE_GOALS := all PRODUCT-%



# A list of goals which affect parsing of makefiles and we need to pass to Kati.

PARSE_TIME_MAKE_GOALS := \

core/product_config.mk

+1 −9
Original line number Diff line number Diff line
@@ -139,15 +139,7 @@ endif # CALLED_FROM_SETUP 
ifeq ($(CALLED_FROM_SETUP),true)

unbundled_goals := $(strip $(filter APP-%,$(MAKECMDGOALS)))

ifdef unbundled_goals

  ifneq ($(words $(unbundled_goals)),1)

    $(error Only one APP-* goal may be specified; saw "$(unbundled_goals)")

  endif

  TARGET_BUILD_APPS := $(strip $(subst -, ,$(patsubst APP-%,%,$(unbundled_goals))))

  ifneq ($(filter droid,$(MAKECMDGOALS)),)

    override MAKECMDGOALS := $(patsubst $(unbundled_goals),,$(MAKECMDGOALS))

  else

    override MAKECMDGOALS := $(patsubst $(unbundled_goals),droid,$(MAKECMDGOALS))

  endif

  $(error The APP-* goal is no longer supported. Use `TARGET_BUILD_APPS="<app>" m droid` instead)

endif # unbundled_goals

endif