Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4451946b authored by Dan Albert's avatar Dan Albert Committed by Automerger Merge Worker
Browse files

Merge changes from topic "abigail-werror" am: e31a0713 am: 30cfbf22 am: d0399047 

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



Change-Id: Id24a2c0c0c4d09fe1c9421a71ba421d73ec1a350
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d87262f d0399047

cc/ndk_abi.go

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ func (n *ndkAbiDumpSingleton) GenerateBuildActions(ctx android.SingletonContext) 


		if m, ok := module.(*Module); ok {

			if installer, ok := m.installer.(*stubDecorator); ok {

				if canDumpAbi() {

				if canDumpAbi(ctx.Config()) {

					depPaths = append(depPaths, installer.abiDumpPath)

				}

			}

cc/ndk_library.go

+13 −3
Original line number Diff line number Diff line
@@ -321,8 +321,18 @@ func (this *stubDecorator) findPrebuiltAbiDump(ctx ModuleContext, 
}



// Feature flag.

func canDumpAbi() bool {

	return runtime.GOOS != "darwin"

func canDumpAbi(config android.Config) bool {

	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.
@@ -458,7 +468,7 @@ func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) O 
	nativeAbiResult := parseNativeAbiDefinition(ctx, symbolFile, c.apiLevel, "")

	objs := compileStubLibrary(ctx, flags, nativeAbiResult.stubSrc)

	c.versionScriptPath = nativeAbiResult.versionScript

	if canDumpAbi() {

	if canDumpAbi(ctx.Config()) {

		c.dumpAbi(ctx, nativeAbiResult.symbolList)

		if canDiffAbi() {

			c.diffAbi(ctx)