Merge "Automatically enable abi checker for the stub libs" (c61c83db) · Commits · e / os / android_build_soong

cc/library.go

+12 −2

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ func (library *libraryDecorator) classifySourceAbiDump(ctx ModuleContext) string
		}
		}
		}
		if enabled != nil && Bool(enabled) {
		if Bool(enabled) \|\| ctx.hasStubsVariants() {
		return "PLATFORM"
		}
		return ""
		@@ -894,7 +894,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
		}
		exportedHeaderFlags := strings.Join(SourceAbiFlags, " ")
		library.sAbiOutputFile = TransformDumpToLinkedDump(ctx, objs.sAbiDumpFiles, soFile, fileName, exportedHeaderFlags,
		android.OptionalPathForModuleSrc(ctx, library.Properties.Header_abi_checker.Symbol_file),
		android.OptionalPathForModuleSrc(ctx, library.symbolFileForAbiCheck(ctx)),
		library.Properties.Header_abi_checker.Exclude_symbol_versions,
		library.Properties.Header_abi_checker.Exclude_symbol_tags)

		@@ -1095,6 +1095,16 @@ func (library *libraryDecorator) buildStubs() bool {
		return library.MutatedProperties.BuildStubs
		}

		func (library libraryDecorator) symbolFileForAbiCheck(ctx ModuleContext) string {
		if library.Properties.Header_abi_checker.Symbol_file != nil {
		return library.Properties.Header_abi_checker.Symbol_file
		}
		if ctx.hasStubsVariants() && library.Properties.Stubs.Symbol_file != nil {
		return library.Properties.Stubs.Symbol_file
		}
		return nil
		}

		func (library *libraryDecorator) stubsVersion() string {
		return library.MutatedProperties.StubsVersion
		}