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

Merge "NDK library: fix ABI monitoring error message" into main am: 31bbfe911b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2757565

Change-Id: Ie3b48d2fe6afa087d9ffcc5c4c72b4dd1f69cf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aleksei Vetrov
2023-09-27 17:52:17 +00:00
committed by Automerger Merge Worker
parent fcf6a3c1d4 31bbfe911b
commit 58f600b8af
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cc/ndk_library.go
View File

@@ -386,9 +386,11 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
// level.
abiDiffPath := android.PathForModuleOut(ctx, "stgdiff.timestamp")
prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel)
missingPrebuiltErrorTemplate :=
"Did not find prebuilt ABI dump for %q (%q). Generate with " +
"//development/tools/ndk/update_ndk_abi.sh."
missingPrebuiltError := fmt.Sprintf(
"Did not find prebuilt ABI dump for %q (%q). Generate with "+
"//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx),
missingPrebuiltErrorTemplate, this.libraryName(ctx),
prebuiltAbiDump.InvalidReason())
if !prebuiltAbiDump.Valid() {
ctx.Build(pctx, android.BuildParams{
@@ -424,12 +426,15 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
nextAbiDiffPath := android.PathForModuleOut(ctx,
"abidiff_next.timestamp")
nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel)
missingNextPrebuiltError := fmt.Sprintf(
missingPrebuiltErrorTemplate, this.libraryName(ctx),
nextAbiDump.InvalidReason())
if !nextAbiDump.Valid() {
ctx.Build(pctx, android.BuildParams{
Rule: android.ErrorRule,
Output: nextAbiDiffPath,
Args: map[string]string{
"error": missingPrebuiltError,
"error": missingNextPrebuiltError,
},
})
} else {