Use stageDir() to determine the install directory. am: 7d2e60ece7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1622883 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11d3381999e3fa9e08e97cd0e75c6d6e74486cf7
This commit is contained in:
commit
da1e23b7ef
1 changed files with 1 additions and 3 deletions
|
@ -437,10 +437,8 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
|
|||
|
||||
if g.properties.Tool_dir {
|
||||
g.installPath = filepath.Join(toolDir(ctx.Config()), name)
|
||||
} else if g.config.stage == StageMain {
|
||||
g.installPath = filepath.Join(mainDir, "bin", name)
|
||||
} else {
|
||||
g.installPath = filepath.Join(bootstrapDir, "bin", name)
|
||||
g.installPath = filepath.Join(stageDir(g.config), "bin", name)
|
||||
}
|
||||
|
||||
ctx.VisitDepsDepthFirstIf(isGoPluginFor(name),
|
||||
|
|
Loading…
Reference in a new issue