diff options
| -rw-r--r-- | ui/build/config.go | 14 | ||||
| -rw-r--r-- | ui/build/dumpvars.go | 5 | ||||
| -rw-r--r-- | ui/build/kati.go | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index c171a67a9..2605f5b5e 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -50,8 +50,10 @@ type configImpl struct { targetDevice string targetDeviceDir string - pdkBuild bool - brokenDupRules bool + pdkBuild bool + + brokenDupRules bool + brokenPhonyTargets bool pathReplaced bool } @@ -577,6 +579,14 @@ func (c *configImpl) BuildBrokenDupRules() bool { return c.brokenDupRules } +func (c *configImpl) SetBuildBrokenPhonyTargets(val bool) { + c.brokenPhonyTargets = val +} + +func (c *configImpl) BuildBrokenPhonyTargets() bool { + return c.brokenPhonyTargets +} + func (c *configImpl) SetTargetDeviceDir(dir string) { c.targetDeviceDir = dir } diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index 8f9d8f21c..fadf6c6a5 100644 --- a/ui/build/dumpvars.go +++ b/ui/build/dumpvars.go @@ -165,10 +165,12 @@ func runMakeProductConfig(ctx Context, config Config) { // Whether --werror_overriding_commands will work "BUILD_BROKEN_DUP_RULES", + // Used to turn on --werror_ options in Kati + "BUILD_BROKEN_PHONY_TARGETS", + // Not used, but useful to be in the soong.log "BUILD_BROKEN_ANDROIDMK_EXPORTS", "BUILD_BROKEN_DUP_COPY_HEADERS", - "BUILD_BROKEN_PHONY_TARGETS", }, exportEnvVars...), BannerVars...) make_vars, err := dumpMakeVars(ctx, config, config.Arguments(), allVars, true) @@ -196,4 +198,5 @@ func runMakeProductConfig(ctx Context, config Config) { config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true") config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] == "true") + config.SetBuildBrokenPhonyTargets(make_vars["BUILD_BROKEN_PHONY_TARGETS"] != "false") } diff --git a/ui/build/kati.go b/ui/build/kati.go index de8dbf4b2..b54872c1f 100644 --- a/ui/build/kati.go +++ b/ui/build/kati.go @@ -93,6 +93,10 @@ func runKati(ctx Context, config Config) { args = append(args, "--werror_overriding_commands") } + if !config.BuildBrokenPhonyTargets() { + args = append(args, "--werror_real_to_phony", "--werror_phony_looks_real") + } + if !config.Environment().IsFalse("KATI_EMULATE_FIND") { args = append(args, "--use_find_emulator") } |