diff --git a/ui/build/config.go b/ui/build/config.go index 15da1bc8c..1152cd790 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -56,7 +56,6 @@ type configImpl struct { katiSuffix string targetDevice string targetDeviceDir string - fullBuild bool // Autodetected totalRAM uint64 @@ -792,14 +791,6 @@ func (c *configImpl) SetTargetDevice(device string) { c.targetDevice = device } -func (c *configImpl) FullBuild() bool { - return c.fullBuild -} - -func (c *configImpl) SetFullBuild(fullBuild bool) { - c.fullBuild = fullBuild -} - func (c *configImpl) TargetBuildVariant() string { if v, ok := c.environ.Get("TARGET_BUILD_VARIANT"); ok { return v diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index be6f00a18..fe0aca983 100644 --- a/ui/build/dumpvars.go +++ b/ui/build/dumpvars.go @@ -214,9 +214,6 @@ func runMakeProductConfig(ctx Context, config Config) { // So that later Kati runs can find BoardConfig.mk faster "TARGET_DEVICE_DIR", - // To decide whether to skip the old installed cleanup step. - "FULL_BUILD", - // Whether --werror_overriding_commands will work "BUILD_BROKEN_DUP_RULES", @@ -281,7 +278,6 @@ func runMakeProductConfig(ctx Context, config Config) { config.SetNinjaArgs(strings.Fields(makeVars["NINJA_GOALS"])) config.SetTargetDevice(makeVars["TARGET_DEVICE"]) config.SetTargetDeviceDir(makeVars["TARGET_DEVICE_DIR"]) - config.SetFullBuild(makeVars["FULL_BUILD"] == "true") config.SetBuildBrokenDupRules(makeVars["BUILD_BROKEN_DUP_RULES"] == "true") config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true") diff --git a/ui/build/kati.go b/ui/build/kati.go index 668b20eed..06ec64607 100644 --- a/ui/build/kati.go +++ b/ui/build/kati.go @@ -229,11 +229,7 @@ func runKatiBuild(ctx Context, config Config) { // Cleanup steps. cleanCopyHeaders(ctx, config) - // Skip the old installed file cleanup step for few non-full build goals as we don't create - // an installed file list for them. - if config.FullBuild() { - cleanOldInstalledFiles(ctx, config) - } + cleanOldInstalledFiles(ctx, config) } // Clean out obsolete header files on the disk that were *not copied* during the