Merge "Revert "Use installExecutable for cc binaries""
This commit is contained in:
@@ -512,7 +512,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) {
|
|||||||
}
|
}
|
||||||
binary.baseInstaller.subDir = "bootstrap"
|
binary.baseInstaller.subDir = "bootstrap"
|
||||||
}
|
}
|
||||||
binary.baseInstaller.installExecutable(ctx, file)
|
binary.baseInstaller.install(ctx, file)
|
||||||
|
|
||||||
var preferredArchSymlinkPath android.OptionalPath
|
var preferredArchSymlinkPath android.OptionalPath
|
||||||
for _, symlink := range binary.symlinks {
|
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)
|
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 {
|
func (installer *baseInstaller) everInstallable() bool {
|
||||||
// Most cc modules are installable.
|
// Most cc modules are installable.
|
||||||
return true
|
return true
|
||||||
|
Reference in New Issue
Block a user