Merge "Add diff_flags as a header_abi_checker property" (5d069fb8) · Commits · e / os / android_build_soong

cc/builder.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -957,9 +957,10 @@ func unzipRefDump(ctx android.ModuleContext, zippedRefDump android.Path, baseNam
		return outputFile
		}

		// sourceAbiDiff registers a build statement to compare linked sAbi dump files (.ldump).
		// sourceAbiDiff registers a build statement to compare linked sAbi dump files (.lsdump).
		func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceDump android.Path,
		baseName, exportedHeaderFlags string, checkAllApis, isLlndk, isNdk, isVndkExt bool) android.OptionalPath {
		baseName, exportedHeaderFlags string, diffFlags []string,
		checkAllApis, isLlndk, isNdk, isVndkExt bool) android.OptionalPath {

		outputFile := android.PathForModuleOut(ctx, baseName+".abidiff")
		libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
		@@ -990,6 +991,8 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
		if isVndkExt {
		extraFlags = append(extraFlags, "-allow-extensions")
		}
		// TODO(b/232891473): Simplify the above logic with diffFlags.
		extraFlags = append(extraFlags, diffFlags...)

		ctx.Build(pctx, android.BuildParams{
		Rule: sAbiDiff,

+4 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ type LibraryProperties struct {
		// Run checks on all APIs (in addition to the ones referred by
		// one of exported ELF symbols.)
		Check_all_apis *bool

		// Extra flags passed to header-abi-diff
		Diff_flags []string
		}

		// Inject boringssl hash into the shared library. This is only intended for use by external/boringssl.
		@@ -1634,6 +1637,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
		if refAbiDumpFile != nil {
		library.sAbiDiff = sourceAbiDiff(ctx, library.sAbiOutputFile.Path(),
		refAbiDumpFile, fileName, exportedHeaderFlags,
		library.Properties.Header_abi_checker.Diff_flags,
		Bool(library.Properties.Header_abi_checker.Check_all_apis),
		ctx.IsLlndk(), ctx.isNdk(ctx.Config()), ctx.IsVndkExt())
		}