Move cc module installation into Soong
Move cc module installation rules into Soong by overriding InstallBypassMake. Update the locations that find host tools to look in the Make installation directory instead of the Soong installation directory, which will no longer be used. The methods that find host tools are also used on go binaries, so update the config methods that tell Blueprint where to install go binaries to the Make installation directory too. Bug: 204136549 Test: m checkbuild Change-Id: Id172592c195e506102982a4af0084f6d9c68a896
This commit is contained in:
@@ -450,11 +450,6 @@ func (installer *baseInstaller) AndroidMkEntries(ctx AndroidMkContext, entries *
|
||||
if installer.path == (android.InstallPath{}) {
|
||||
return
|
||||
}
|
||||
// Soong installation is only supported for host modules. Have Make
|
||||
// installation trigger Soong installation.
|
||||
if ctx.Target().Os.Class == android.Host {
|
||||
entries.OutputFile = android.OptionalPathForPath(installer.path)
|
||||
}
|
||||
|
||||
entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
|
||||
path, file := filepath.Split(installer.path.ToMakePath().String())
|
||||
|
Reference in New Issue
Block a user