Remove --skip-make

This should no longer be used.

Bug: 376727180
Test: Presubmits
Change-Id: Ib85902c2c9841e32660bc3879514b12175da438e

3 files changed, 6 insertions, 13 deletions

diff --git a/android/module.go b/android/module.go
index b9489b482..a58057e43 100644
--- a/android/module.go
+++ b/android/module.go
@@ -990,8 +990,9 @@ func (m *ModuleBase) baseDepsMutator(ctx BottomUpMutatorContext) {
 	// 2. `boot_signer` is `required` by modules like `build_image` which is explicitly list as
 	// the top-level build goal (in the shell file that invokes Soong).
 	// 3. `boot_signer` depends on `bouncycastle-unbundled` which is in the missing git project.
-	// 4. aosp_kernel-build-tools invokes soong with `--skip-make`. Therefore, the absence of
-	// ALLOW_MISSING_DEPENDENCIES didn't cause a problem.
+	// 4. aosp_kernel-build-tools invokes soong with `--soong-only`. Therefore, the absence of
+	// ALLOW_MISSING_DEPENDENCIES didn't cause a problem, as previously only make processed required
+	// dependencies.
 	// 5. Now, since Soong understands `required` deps, it tries to build `boot_signer` and the
 	// absence of external/bouncycastle fails the build.
 	//
diff --git a/ui/build/build.go b/ui/build/build.go
index 26f59692f..e0c9e6d14 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -38,11 +38,9 @@ func SetupOutDir(ctx Context, config Config) {
 	// 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 @@ func SetupOutDir(ctx Context, config Config) {
 	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 4f2d213b9..5c2debbc8 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -843,12 +843,6 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
 			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