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

ndk_library: separate abidw and abitidy into separate rules

Browse Source 
Both processes might consume a large amount of memory when analyzing
library ABIs. By chaining them via a pipe we keep the same
representation twice in memory. That can introduce a problematic peak
memory consumption. Hence, split them apart into separate rules that
depend on each other.

Bug: 191235788
Test: m out/soong/abi-dumps/ndk/28/x86_64/libc/abi.xml
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ia0264a5ede5b2c2a3c2e3fbe968c11d36acf33c2
This commit is contained in:
Matthias Maennich
2021-09-02 20:45:33 +01:00
parent 5eeb6fc3f2
commit c2346f1c21
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cc/ndk_library.go
View File

@@ -45,11 +45,17 @@ var (
abidw = pctx.AndroidStaticRule("abidw", abidw = pctx.AndroidStaticRule("abidw",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$abidw --type-id-style hash --no-corpus-path " + Command: "$abidw --type-id-style hash --no-corpus-path " +
"--no-show-locs --no-comp-dir-path -w $symbolList $in | " + "--no-show-locs --no-comp-dir-path -w $symbolList " +
"$abitidy --all -o $out", "$in --out-file $out",
CommandDeps: []string{"$abitidy", "$abidw"}, CommandDeps: []string{"$abidw"},
}, "symbolList") }, "symbolList")
abitidy = pctx.AndroidStaticRule("abitidy",
blueprint.RuleParams{
Command: "$abitidy --all -i $in -o $out",
CommandDeps: []string{"$abitidy"},
})
abidiff = pctx.AndroidStaticRule("abidiff", abidiff = pctx.AndroidStaticRule("abidiff",
blueprint.RuleParams{ blueprint.RuleParams{
// Need to create *some* output for ninja. We don't want to use tee // Need to create *some* output for ninja. We don't want to use tee
@@ -313,19 +319,28 @@ func canDiffAbi() bool {
func (this *stubDecorator) dumpAbi(ctx ModuleContext, symbolList android.Path) { func (this *stubDecorator) dumpAbi(ctx ModuleContext, symbolList android.Path) {
implementationLibrary := this.findImplementationLibrary(ctx) implementationLibrary := this.findImplementationLibrary(ctx)
this.abiDumpPath = getNdkAbiDumpInstallBase(ctx).Join(ctx, abiRawPath := getNdkAbiDumpInstallBase(ctx).Join(ctx,
this.apiLevel.String(), ctx.Arch().ArchType.String(), this.apiLevel.String(), ctx.Arch().ArchType.String(),
this.libraryName(ctx), "abi.xml") this.libraryName(ctx), "abi.raw.xml")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: abidw, Rule: abidw,
Description: fmt.Sprintf("abidw %s", implementationLibrary), Description: fmt.Sprintf("abidw %s", implementationLibrary),
Output: this.abiDumpPath,
Input: implementationLibrary, Input: implementationLibrary,
Output: abiRawPath,
Implicit: symbolList, Implicit: symbolList,
Args: map[string]string{ Args: map[string]string{
"symbolList": symbolList.String(), "symbolList": symbolList.String(),
}, },
}) })
this.abiDumpPath = getNdkAbiDumpInstallBase(ctx).Join(ctx,
this.apiLevel.String(), ctx.Arch().ArchType.String(),
this.libraryName(ctx), "abi.xml")
ctx.Build(pctx, android.BuildParams{
Rule: abitidy,
Description: fmt.Sprintf("abitidy %s", implementationLibrary),
Input: abiRawPath,
Output: this.abiDumpPath,
})
} }
func findNextApiLevel(ctx ModuleContext, apiLevel android.ApiLevel) *android.ApiLevel { func findNextApiLevel(ctx ModuleContext, apiLevel android.ApiLevel) *android.ApiLevel {