StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obsolete BUILD_BROKEN_PHONY_TARGETS

Browse Source 
There are no remaining users.

Also mark BUILD_BROKEN_ANDROIDMK_EXPORTS and BUILD_BROKEN_ENG_DEBUG_TAGS
as deprecated in scripts/build_broken_logs.go

Test: treehugger
Change-Id: If7892bef1b9001f12a99565f886b395cf1985e70
This commit is contained in:
Dan Willemsen
2019-04-18 09:40:15 -07:00
parent 9820aa6cc8
commit 6097746769
4 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build_broken_logs.go
View File

@@ -71,21 +71,12 @@ var buildBrokenSettings = []struct {
}, },
{ {
name: "BUILD_BROKEN_ANDROIDMK_EXPORTS", name: "BUILD_BROKEN_ANDROIDMK_EXPORTS",
behavior: DefaultFalse, behavior: DefaultDeprecated,
warnings: []string{"export_keyword"}, warnings: []string{"export_keyword"},
}, },
{
name: "BUILD_BROKEN_PHONY_TARGETS",
behavior: DefaultFalse,
warnings: []string{
"depends on PHONY target",
"looks like a real file",
"writing to readonly directory",
},
},
{ {
name: "BUILD_BROKEN_ENG_DEBUG_TAGS", name: "BUILD_BROKEN_ENG_DEBUG_TAGS",
behavior: DefaultTrue, behavior: DefaultDeprecated,
warnings: []string{ warnings: []string{
"Changes.md#LOCAL_MODULE_TAGS", "Changes.md#LOCAL_MODULE_TAGS",
}, },

9
ui/build/config.go
View File

@@ -54,7 +54,6 @@ type configImpl struct {
pdkBuild bool pdkBuild bool
brokenDupRules bool brokenDupRules bool
brokenPhonyTargets bool
brokenUsesNetwork bool brokenUsesNetwork bool
pathReplaced bool pathReplaced bool
@@ -615,14 +614,6 @@ func (c *configImpl) BuildBrokenDupRules() bool {
return c.brokenDupRules return c.brokenDupRules
} }
func (c *configImpl) SetBuildBrokenPhonyTargets(val bool) {
c.brokenPhonyTargets = val
}
func (c *configImpl) BuildBrokenPhonyTargets() bool {
return c.brokenPhonyTargets
}
func (c *configImpl) SetBuildBrokenUsesNetwork(val bool) { func (c *configImpl) SetBuildBrokenUsesNetwork(val bool) {
c.brokenUsesNetwork = val c.brokenUsesNetwork = val
} }

4
ui/build/dumpvars.go
View File

@@ -200,9 +200,6 @@ func runMakeProductConfig(ctx Context, config Config) {
// Whether --werror_overriding_commands will work // Whether --werror_overriding_commands will work
"BUILD_BROKEN_DUP_RULES", "BUILD_BROKEN_DUP_RULES",
// Used to turn on --werror_ options in Kati
"BUILD_BROKEN_PHONY_TARGETS",
// Whether to enable the network during the build // Whether to enable the network during the build
"BUILD_BROKEN_USES_NETWORK", "BUILD_BROKEN_USES_NETWORK",
@@ -276,6 +273,5 @@ func runMakeProductConfig(ctx Context, config Config) {
config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true") config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true")
config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] == "true") config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] == "true")
config.SetBuildBrokenPhonyTargets(make_vars["BUILD_BROKEN_PHONY_TARGETS"] == "true")
config.SetBuildBrokenUsesNetwork(make_vars["BUILD_BROKEN_USES_NETWORK"] == "true") config.SetBuildBrokenUsesNetwork(make_vars["BUILD_BROKEN_USES_NETWORK"] == "true")
} }

16
ui/build/kati.go
View File

@@ -81,6 +81,9 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF
"--werror_suffix_rules", "--werror_suffix_rules",
"--warn_real_to_phony", "--warn_real_to_phony",
"--warn_phony_looks_real", "--warn_phony_looks_real",
"--werror_real_to_phony",
"--werror_phony_looks_real",
"--werror_writable",
"--top_level_phony", "--top_level_phony",
"--kati_stats", "--kati_stats",
}, args...) }, args...)
@@ -138,13 +141,6 @@ func runKatiBuild(ctx Context, config Config) {
args = append(args, "--werror_overriding_commands") args = append(args, "--werror_overriding_commands")
} }
if !config.BuildBrokenPhonyTargets() {
args = append(args,
"--werror_real_to_phony",
"--werror_phony_looks_real",
"--werror_writable")
}
args = append(args, config.KatiArgs()...) args = append(args, config.KatiArgs()...)
args = append(args, args = append(args,
@@ -162,11 +158,8 @@ func runKatiPackage(ctx Context, config Config) {
args := []string{ args := []string{
"--writable", config.DistDir() + "/", "--writable", config.DistDir() + "/",
"--werror_writable",
"--werror_implicit_rules", "--werror_implicit_rules",
"--werror_overriding_commands", "--werror_overriding_commands",
"--werror_real_to_phony",
"--werror_phony_looks_real",
"-f", "build/make/packaging/main.mk", "-f", "build/make/packaging/main.mk",
"KATI_PACKAGE_MK_DIR=" + config.KatiPackageMkDir(), "KATI_PACKAGE_MK_DIR=" + config.KatiPackageMkDir(),
} }
@@ -202,11 +195,8 @@ func runKatiCleanSpec(ctx Context, config Config) {
defer ctx.EndTrace() defer ctx.EndTrace()
runKati(ctx, config, katiCleanspecSuffix, []string{ runKati(ctx, config, katiCleanspecSuffix, []string{
"--werror_writable",
"--werror_implicit_rules", "--werror_implicit_rules",
"--werror_overriding_commands", "--werror_overriding_commands",
"--werror_real_to_phony",
"--werror_phony_looks_real",
"-f", "build/make/core/cleanbuild.mk", "-f", "build/make/core/cleanbuild.mk",
"SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(), "SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(),
"TARGET_DEVICE_DIR=" + config.TargetDeviceDir(), "TARGET_DEVICE_DIR=" + config.TargetDeviceDir(),