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

Commit 562bacca authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove the rest of showcommands, dist goal 

showcommands is all handled in soong_ui, make/kati/ninja never see the
argument.

Remove the dist goal, since we'll never pass it to ninja, only to Kati
as a modifier.

Remove DUMP_%, since that's not used anywhere (it appears to be in our
code search via the NDK build system)

Test: m -j showcommands dist
Change-Id: I0d1498128caece685e98c2c2b5b0c3f545da0e11
parent 7bc6eb12

core/config.mk

+1 −5
Original line number Diff line number Diff line
@@ -129,11 +129,7 @@ BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java 
# Parse out any modifier targets.

# ###############################################################



# The 'showcommands' goal says to show the full command

# lines being executed, instead of a short message about

# the kind of operation being done.

SHOW_COMMANDS:= $(filter showcommands,$(MAKECMDGOALS))

hide := $(if $(SHOW_COMMANDS),,@)

hide := @



################################################################

# Tools needed in product configuration makefiles.

core/distdir.mk

+0 −8
Original line number Diff line number Diff line
@@ -17,16 +17,8 @@ 
# When specifying "dist", the user has asked that we copy the important

# files from this build into DIST_DIR.



.PHONY: dist

dist: ;



dist_goal := $(strip $(filter dist,$(MAKECMDGOALS)))

MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))

ifeq (,$(strip $(filter-out $(INTERNAL_MODIFIER_TARGETS),$(MAKECMDGOALS))))

# The commandline was something like "make dist" or "make dist showcommands".

# Add a dependency on a real target.

dist: $(DEFAULT_GOAL)

endif



ifdef dist_goal

core/main.mk

+2 −6
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ include $(BUILD_SYSTEM)/cleanbuild.mk 
# These are the modifier targets that don't do anything themselves, but

# change the behavior of the build.

# (must be defined before including definitions.make)

INTERNAL_MODIFIER_TARGETS := showcommands all

INTERNAL_MODIFIER_TARGETS := all



# EMMA_INSTRUMENT_STATIC merges the static emma library to each emma-enabled module.

ifeq (true,$(EMMA_INSTRUMENT_STATIC))
@@ -326,7 +326,7 @@ endef 
endif





# If they only used the modifier goals (showcommands, etc), we'll actually

# If they only used the modifier goals (all, etc), we'll actually

# build the default target.

ifeq ($(filter-out $(INTERNAL_MODIFIER_TARGETS),$(MAKECMDGOALS)),)

.PHONY: $(INTERNAL_MODIFIER_TARGETS)
@@ -1127,10 +1127,6 @@ modules: 
	@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \

	      tr -s ' ' '\n' | sort -u | $(COLUMN)



.PHONY: showcommands

showcommands:

	@echo >/dev/null



.PHONY: nothing

nothing:

	@echo Successfully read the makefiles.

core/ninja_config.mk

+1 −3
Original line number Diff line number Diff line
@@ -7,8 +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 := showcommands all dist

.PHONY : $(NINJA_EXCLUDE_GOALS)

NINJA_EXCLUDE_GOALS := all dist



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

PARSE_TIME_MAKE_GOALS := \
@@ -16,7 +15,6 @@ PARSE_TIME_MAKE_GOALS := \ 
	$(dont_bother_goals) \

	all \

	APP-% \

	DUMP_% \

	ECLIPSE-% \

	PRODUCT-% \

	AUX-% \