diff options
| author | 2021-01-26 00:13:46 +0000 | |
|---|---|---|
| committer | 2021-01-26 00:13:46 +0000 | |
| commit | 9b6596bb60776f14533297eab965b9c20d8f5e1a (patch) | |
| tree | f5f794d7f050b451dce853e560498540693414b5 /apex/builder.go | |
| parent | 7328c25275b23e8cd1d84451552c34323e22a3a0 (diff) | |
| parent | 6bde0b5f9dba13c9e02ffd8936bb93599f086526 (diff) | |
Merge "Revert "Revert "Automated NDK API coverage used by Mainline modules build integration."""
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index e6bc3bdb4..67314d85b 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -687,7 +687,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { implicitInputs = append(implicitInputs, unsignedOutputFile) // Run coverage analysis - apisUsedbyOutputFile := android.PathForModuleOut(ctx, a.Name()+".txt") + apisUsedbyOutputFile := android.PathForModuleOut(ctx, a.Name()+"_using.txt") ctx.Build(pctx, android.BuildParams{ Rule: generateAPIsUsedbyApexRule, Implicits: implicitInputs, @@ -698,7 +698,19 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { "readelf": "${config.ClangBin}/llvm-readelf", }, }) - a.coverageOutputPath = apisUsedbyOutputFile + a.apisUsedByModuleFile = apisUsedbyOutputFile + + apisBackedbyOutputFile := android.PathForModuleOut(ctx, a.Name()+"_backing.txt") + ndkLibraryList := android.PathForSource(ctx, "system/core/rootdir/etc/public.libraries.android.txt") + rule := android.NewRuleBuilder(pctx, ctx) + rule.Command(). + Tool(android.PathForSource(ctx, "build/soong/scripts/gen_ndk_backedby_apex.sh")). + Text(imageDir.String()). + Implicits(implicitInputs). + Output(apisBackedbyOutputFile). + Input(ndkLibraryList) + rule.Build("ndk_backedby_list", "Generate API libraries backed by Apex") + a.apisBackedByModuleFile = apisBackedbyOutputFile bundleConfig := a.buildBundleConfig(ctx) |