Browse Source

Revert "Use installExecutable for cc binaries"

This reverts commit c1fd399ccd8597f6d150a3385d468aeead42d44d.

Reason for revert: build break for prebuilt host binary in read-only source tree

Change-Id: I9f1792f324acbfbaf53254a972cb0894140efabe
Test: m BUILD_BROKEN_SRC_DIR_IS_WRITABLE=false mkimage-host
Bug: 287168966
胡泊 11 months ago
parent
commit
6fe07a5017
2 changed files with 1 additions and 5 deletions
  1. 1 1
      cc/binary.go
  2. 0 4
      cc/installer.go

+ 1 - 1
cc/binary.go

@@ -512,7 +512,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) {
 		}
 		binary.baseInstaller.subDir = "bootstrap"
 	}
-	binary.baseInstaller.installExecutable(ctx, file)
+	binary.baseInstaller.install(ctx, file)
 
 	var preferredArchSymlinkPath android.OptionalPath
 	for _, symlink := range binary.symlinks {

+ 0 - 4
cc/installer.go

@@ -100,10 +100,6 @@ func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) {
 	installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file)
 }
 
-func (installer *baseInstaller) installExecutable(ctx ModuleContext, file android.Path) {
-	installer.path = ctx.InstallExecutable(installer.installDir(ctx), file.Base(), file)
-}
-
 func (installer *baseInstaller) everInstallable() bool {
 	// Most cc modules are installable.
 	return true