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

Merge changes from topic "abigail-werror" am: e31a071389 am: 30cfbf22eb

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

Change-Id: I13c2a114ff2cb8ca15b1a3c72f5f847b8cd06e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dan Albert
2022-04-20 20:19:19 +00:00
committed by Automerger Merge Worker
parent e5cae493fe 30cfbf22eb
commit d0399047c0
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/ndk_abi.go
View File

@@ -46,7 +46,7 @@ func (n *ndkAbiDumpSingleton) GenerateBuildActions(ctx android.SingletonContext)
if m, ok := module.(*Module); ok { if m, ok := module.(*Module); ok {
if installer, ok := m.installer.(*stubDecorator); ok { if installer, ok := m.installer.(*stubDecorator); ok {
if canDumpAbi() { if canDumpAbi(ctx.Config()) {
depPaths = append(depPaths, installer.abiDumpPath) depPaths = append(depPaths, installer.abiDumpPath)
} }
} }

16
cc/ndk_library.go
View File

@@ -321,8 +321,18 @@ func (this *stubDecorator) findPrebuiltAbiDump(ctx ModuleContext,
} }
// Feature flag. // Feature flag.
func canDumpAbi() bool { func canDumpAbi(config android.Config) bool {
return runtime.GOOS != "darwin" if runtime.GOOS == "darwin" {
return false
}
// abidw doesn't currently handle top-byte-ignore correctly. Disable ABI
// dumping for those configs while we wait for a fix. We'll still have ABI
// checking coverage from non-hwasan builds.
// http://b/190554910
if android.InList("hwaddress", config.SanitizeDevice()) {
return false
}
return true
} }
// Feature flag to disable diffing against prebuilts. // Feature flag to disable diffing against prebuilts.
@@ -458,7 +468,7 @@ func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) O
nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile, c.apiLevel, "") nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile, c.apiLevel, "")
objs := compileStubLibrary(ctx, flags, nativeAbiResult.stubSrc) objs := compileStubLibrary(ctx, flags, nativeAbiResult.stubSrc)
c.versionScriptPath = nativeAbiResult.versionScript c.versionScriptPath = nativeAbiResult.versionScript
if canDumpAbi() { if canDumpAbi(ctx.Config()) {
c.dumpAbi(ctx, nativeAbiResult.symbolList) c.dumpAbi(ctx, nativeAbiResult.symbolList)
if canDiffAbi() { if canDiffAbi() {
c.diffAbi(ctx) c.diffAbi(ctx)