Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fe07a50 authored by 胡泊's avatar 胡泊 Committed by Gerrit Code Review
Browse files

Revert "Use installExecutable for cc binaries" 

This reverts commit c1fd399c.

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
parent c1fd399c

cc/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -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 {

cc/installer.go

+0 −4
Original line number Diff line number Diff line
@@ -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