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

Commit 01ab167a authored Jul 25, 2019 by Dan Willemsen

Remove the APP-* goal

I can't find anything still using this, and I'm close to removing the
PRODUCT-* goal.

Test: codesearch (both android and the build configs)
Test: m APP-test
Change-Id: I4efdcdea2bb9ace14632cab35a2a1c7bdc89592f

parent b4befed8

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