tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Use installExecutable for cc binaries""

Browse source
This commit is contained in:
Treehugger Robot 2023-06-15 01:39:25 +00:00 committed by Gerrit Code Review
commit e3056e0d78
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/binary.go
View file

@ -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 {

4
cc/installer.go
View file

@ -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