Merge "Strip device name from gen_notice license files"
This commit is contained in:
@@ -16,6 +16,7 @@ package android
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/google/blueprint/proptools"
|
"github.com/google/blueprint/proptools"
|
||||||
@@ -73,6 +74,7 @@ func (s *genNoticeBuildRules) GenerateBuildActions(ctx SingletonContext) {
|
|||||||
out(ctx, gm.output, ctx.ModuleName(gm),
|
out(ctx, gm.output, ctx.ModuleName(gm),
|
||||||
proptools.StringDefault(gm.properties.ArtifactName, defaultName),
|
proptools.StringDefault(gm.properties.ArtifactName, defaultName),
|
||||||
[]string{
|
[]string{
|
||||||
|
filepath.Join(ctx.Config().OutDir(), "target", "product", ctx.Config().DeviceName()) + "/",
|
||||||
ctx.Config().OutDir() + "/",
|
ctx.Config().OutDir() + "/",
|
||||||
ctx.Config().SoongOutDir() + "/",
|
ctx.Config().SoongOutDir() + "/",
|
||||||
}, modules...)
|
}, modules...)
|
||||||
|
Reference in New Issue
Block a user