StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert genDir to RULEDIR in gensrcs's cmd

Browse Source 
Test: CI
Change-Id: I5ecc19dc73559bb518871080737b28a649edc162
This commit is contained in:
Vinh Tran
2022-09-23 13:08:34 -04:00
parent 7574afb67f
commit 32a98a5d55
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/allowlists/allowlists.go
View File

@@ -571,6 +571,8 @@ var (
"libnativeloader",
"libEGL_getProcAddress",
"libEGL_blobCache",
"protoc-gen-cppstream",
}
Bp2buildModuleTypeAlwaysConvertList = []string{
@@ -637,7 +639,6 @@ var (
"conscrypt", // TODO(b/210751803), we don't handle path property for filegroups
"conscrypt-for-host", // TODO(b/210751803), we don't handle path property for filegroups
"host-libprotobuf-java-full", // TODO(b/210751803), we don't handle path property for filegroups
"libprotobuf-internal-protos", // TODO(b/210751803), we don't handle path property for filegroups
"libprotobuf-internal-python-srcs", // TODO(b/210751803), we don't handle path property for filegroups
"libprotobuf-java-full", // TODO(b/210751803), we don't handle path property for filegroups
"libprotobuf-java-util-full", // TODO(b/210751803), we don't handle path property for filegroups

8
genrule/genrule.go
View File

@@ -909,13 +909,7 @@ func (m *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
cmd = strings.Replace(*m.properties.Cmd, "$(in)", "$(SRCS)", -1)
cmd = strings.Replace(cmd, "$(out)", "$(OUTS)", -1)
}
genDir := "$(RULEDIR)"
if ctx.ModuleType() == "gensrcs" {
genDir = "$(GENDIR)"
}
cmd = strings.Replace(cmd, "$(genDir)", genDir, -1)
cmd = strings.Replace(cmd, "$(genDir)", "$(RULEDIR)", -1)
if len(tools.Value.Includes) > 0 {
cmd = strings.Replace(cmd, "$(location)", fmt.Sprintf("$(location %s)", tools.Value.Includes[0].Label), -1)
cmd = strings.Replace(cmd, "$(locations)", fmt.Sprintf("$(locations %s)", tools.Value.Includes[0].Label), -1)