StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Use installExecutable for cc binaries"" am: e3056e0d78

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2624314

Change-Id: I765949f2015bfee6dbf197751e4f31e316132c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-15 02:26:08 +00:00
committed by Automerger Merge Worker
parent a21b4567fa e3056e0d78
commit e609d23bc3
2 changed files with 1 additions and 5 deletions
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.installExecutable(ctx, file)
binary.baseInstaller.install(ctx, file)
var preferredArchSymlinkPath android.OptionalPath
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)
}
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