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

Revert "Use installExecutable for cc binaries"

Browse Source 
This reverts commit c1fd399ccd.

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
This commit is contained in:
胡泊
2023-06-14 07:38:44 +00:00
committed by Gerrit Code Review
parent c1fd399ccd
commit 6fe07a5017
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