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

Merge "Fix m ndk." into main am: 29c267af2d

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

Change-Id: I4c8105aebcc6f1a33bcf6a8d018f132b19f8e723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-20 23:05:08 +00:00
committed by Automerger Merge Worker
parent f18d9c2abe 29c267af2d
commit a26b69332a
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/ndk_library.go
View File

@@ -429,12 +429,15 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
// Also ensure that the ABI of the next API level (if there is one) matches
// this API level. *New* ABI is allowed, but any changes to APIs that exist
// in this API level are disallowed.
if !this.apiLevel.IsCurrent() && prebuiltAbiDump.Valid() {
if prebuiltAbiDump.Valid() {
nextApiLevel := findNextApiLevel(ctx, this.apiLevel)
if nextApiLevel == nil {
panic(fmt.Errorf("could not determine which API level follows "+
"non-current API level %s", this.apiLevel))
}
// "current" ABI is not tracked.
if !nextApiLevel.IsCurrent() {
nextAbiDiffPath := android.PathForModuleOut(ctx,
"abidiff_next.timestamp")
nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel)
@@ -466,6 +469,7 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
this.abiDiffPaths = append(this.abiDiffPaths, nextAbiDiffPath)
}
}
}
func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {
if !strings.HasSuffix(String(c.properties.Symbol_file), ".map.txt") {