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
diff --git a/cc/binary.go b/cc/binary.go
index 097f822..496c610 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -512,7 +512,7 @@
}
binary.baseInstaller.subDir = "bootstrap"
}
- binary.baseInstaller.installExecutable(ctx, file)
+ binary.baseInstaller.install(ctx, file)
var preferredArchSymlinkPath android.OptionalPath
for _, symlink := range binary.symlinks {
diff --git a/cc/installer.go b/cc/installer.go
index 716a0df..e2c0e7b 100644
--- a/cc/installer.go
+++ b/cc/installer.go
@@ -100,10 +100,6 @@
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