diff options
| author | 2022-04-20 19:53:13 +0000 | |
|---|---|---|
| committer | 2022-04-20 19:53:13 +0000 | |
| commit | 73de4dbcc10973b9217dca672193e4879d49d70c (patch) | |
| tree | bbb6a6844e750ec1827f2dbef53264407966a939 | |
| parent | 0ad2da70c1aef9a27d20785e654b2639e8bfaa5b (diff) | |
| parent | 604086f988507b877e8e6aeb620b3c9a26630fb1 (diff) | |
Abort on abitidy errors. am: 604086f988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737315
Change-Id: I1833517f786194dd61a2211254f4515bdbc04871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cc/ndk_library.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/cc/ndk_library.go b/cc/ndk_library.go index fc682ff70..5f0262d74 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -53,9 +53,9 @@ var ( abitidy = pctx.AndroidStaticRule("abitidy", blueprint.RuleParams{ - Command: "$abitidy --all -i $in -o $out", + Command: "$abitidy --all $flags -i $in -o $out", CommandDeps: []string{"$abitidy"}, - }) + }, "flags") abidiff = pctx.AndroidStaticRule("abidiff", blueprint.RuleParams{ @@ -104,6 +104,12 @@ type libraryProperties struct { // used. This is only needed to work around platform bugs like // https://github.com/android-ndk/ndk/issues/265. Unversioned_until *string + + // If true, does not emit errors when APIs lacking type information are + // found. This is false by default and should not be enabled outside bionic, + // where it is enabled pending a fix for http://b/190554910 (no debug info + // for asm implemented symbols). + Allow_untyped_symbols *bool } type stubDecorator struct { @@ -339,14 +345,22 @@ func (this *stubDecorator) dumpAbi(ctx ModuleContext, symbolList android.Path) { "symbolList": symbolList.String(), }, }) + this.abiDumpPath = getNdkAbiDumpInstallBase(ctx).Join(ctx, this.apiLevel.String(), ctx.Arch().ArchType.String(), this.libraryName(ctx), "abi.xml") + untypedFlag := "--abort-on-untyped-symbols" + if proptools.BoolDefault(this.properties.Allow_untyped_symbols, false) { + untypedFlag = "" + } ctx.Build(pctx, android.BuildParams{ Rule: abitidy, Description: fmt.Sprintf("abitidy %s", implementationLibrary), Input: abiRawPath, Output: this.abiDumpPath, + Args: map[string]string{ + "flags": untypedFlag, + }, }) } |