Remove --skip-make
This should no longer be used.
Bug: 376727180
Test: Presubmits
Change-Id: Ib85902c2c9841e32660bc3879514b12175da438e
diff --git a/ui/build/build.go b/ui/build/build.go
index 26f5969..e0c9e6d 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -38,11 +38,9 @@
// Note that the absence of the file does not not preclude running Kati for product
// configuration purposes.
katiEnabledMarker := filepath.Join(config.SoongOutDir(), ".soong.kati_enabled")
- if config.SkipKatiNinja() {
+ if config.SkipKati() || config.SkipKatiNinja() {
os.Remove(katiEnabledMarker)
- // Note that we can not remove the file for SkipKati builds yet -- some continuous builds
- // --skip-make builds rely on kati targets being defined.
- } else if !config.SkipKati() {
+ } else {
ensureEmptyFileExists(ctx, katiEnabledMarker)
}
@@ -52,7 +50,7 @@
ensureEmptyFileExists(ctx, filepath.Join(config.OutDir(), ".out-dir"))
if buildDateTimeFile, ok := config.environ.Get("BUILD_DATETIME_FILE"); ok {
- err := ioutil.WriteFile(buildDateTimeFile, []byte(config.buildDateTime), 0666) // a+rw
+ err := os.WriteFile(buildDateTimeFile, []byte(config.buildDateTime), 0666) // a+rw
if err != nil {
ctx.Fatalln("Failed to write BUILD_DATETIME to file:", err)
}
diff --git a/ui/build/config.go b/ui/build/config.go
index 4f2d213..5c2debb 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -843,12 +843,6 @@
c.emptyNinjaFile = true
} else if arg == "--skip-ninja" {
c.skipNinja = true
- } else if arg == "--skip-make" {
- // TODO(ccross): deprecate this, it has confusing behaviors. It doesn't run kati,
- // but it does run a Kati ninja file if the .kati_enabled marker file was created
- // by a previous build.
- c.skipConfig = true
- c.skipKati = true
} else if arg == "--soong-only" {
c.skipKati = true
c.skipKatiNinja = true