Merge "Remove unneeded logic from sourceAbiDiff" (6e9225d5) · Commits · e / os / android_build_soong

cc/builder.go

+2 −13

Original line number	Diff line number	Diff line
		@@ -925,7 +925,6 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD

		outputFile := android.PathForModuleOut(ctx, baseName+".abidiff")
		libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
		createReferenceDumpFlags := ""

		var extraFlags []string
		if checkAllApis {
		@@ -936,19 +935,9 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
		"-allow-unreferenced-elf-symbol-changes")
		}

		if exportedHeaderFlags == "" {
		extraFlags = append(extraFlags, "-advice-only")
		}

		if isLlndk \|\| isNdk {
		createReferenceDumpFlags = "--llndk"
		if isLlndk {
		// TODO(b/130324828): "-consider-opaque-types-different" should apply to
		// both LLNDK and NDK shared libs. However, a known issue in header-abi-diff
		// breaks libaaudio. Remove the if-guard after the issue is fixed.
		extraFlags = append(extraFlags, "-consider-opaque-types-different")
		}
		}
		if isVndkExt {
		extraFlags = append(extraFlags, "-allow-extensions")
		}
		@@ -966,7 +955,7 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
		"libName": libName,
		"arch": ctx.Arch().ArchType.Name,
		"extraFlags": strings.Join(extraFlags, " "),
		"createReferenceDumpFlags": createReferenceDumpFlags,
		"createReferenceDumpFlags": "",
		},
		})
		return android.OptionalPathForPath(outputFile)