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

Commit 2f1e0522 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use installExecutable for cc binaries"

parents 2204e164 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.install(ctx, file)

	binary.baseInstaller.installExecutable(ctx, file)



	var preferredArchSymlinkPath android.OptionalPath

	for _, symlink := range binary.symlinks {

cc/installer.go

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