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

Commit 4b96b1c3 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Make multiple rules to generate a file an error" am: 5e2e53e4 am: 44c7b4b8 

am: a27a5910

* commit 'a27a5910':
  Make multiple rules to generate a file an error
parents 929feae7 a27a5910

core/ninja.mk

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS))) 
NINJA_ARGS += "-v"

endif



# Make multiple rules to generate the same target an error instead of

# proceeding with undefined behavior.

NINJA_ARGS += -w dupbuild=err



ifdef USE_GOMA

KATI_MAKEPARALLEL := $(MAKEPARALLEL)

# Ninja runs remote jobs (i.e., commands which contain gomacc) with