Merge "Revert "Skip old file cleanup for non-full builds."" (75a38ba7) · Commits · e / os / android_build_soong

ui/build/config.go

+0 −9

Original line number	Diff line number	Diff line
		@@ -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

+0 −4

Original line number	Diff line number	Diff line
		@@ -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")

+1 −5

Original line number	Diff line number	Diff line
		@@ -229,12 +229,8 @@ 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)
		}
		}

		// Clean out obsolete header files on the disk that were not copied during the
		// build with BUILD_COPY_HEADERS and LOCAL_COPY_HEADERS.