openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Skip old file cleanup for non-full builds."" am: 75a38ba791 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3186c4eeb2d83cc57e422190e7b24be13d49b98
This commit is contained in:
Colin Cross 2021-03-10 23:08:18 +00:00 committed by Automerger Merge Worker
parent 1d58079c9c 75a38ba791
commit 0fe5a48ccc
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/build/config.go
View File

@ -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

4
ui/build/dumpvars.go
View File

@ -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")

6
ui/build/kati.go
View File

@ -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