Merge "Revert "Use installExecutable for cc binaries""
This commit is contained in:
commit
e3056e0d78
2 changed files with 1 additions and 5 deletions
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue