Merge "Ensure opt-in platform ABI dumps are configured with ref_dump_dirs" into main (d75bc494) · Commits · e / os / android_build_soong

cc/library.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -1490,6 +1490,11 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathD
		fileName, nameExt, isLlndk)
		}
		}
		// Ensure that a module tagged with only platformLsdumpTag has ref_dump_dirs.
		// Android.bp in vendor projects should be cleaned up before this is enforced for vendorLsdumpTag and productLsdumpTag.
		if len(headerAbiChecker.Ref_dump_dirs) == 0 && len(tags) == 1 && tags[0] == platformLsdumpTag {
		ctx.ModuleErrorf("header_abi_checker is explicitly enabled, but no ref_dump_dirs are specified.")
		}
		// Check against the opt-in reference dumps.
		for i, optInDumpDir := range headerAbiChecker.Ref_dump_dirs {
		optInDumpDirPath := android.PathForModuleSrc(ctx, optInDumpDir)

+2 −4

Original line number	Diff line number	Diff line
		@@ -43,8 +43,6 @@ func (tag *lsdumpTag) dirName() string {
		return "platform"
		case llndkLsdumpTag:
		return "vndk"
		case platformLsdumpTag:
		return "platform"
		default:
		return ""
		}
		@@ -134,10 +132,10 @@ func classifySourceAbiDump(ctx android.BaseModuleContext) []lsdumpTag {
		if m.isImplementationForLLNDKPublic() {
		result = append(result, llndkLsdumpTag)
		}
		// APEX and opt-in platform dumps are placed in the same directory.
		if m.library.hasStubsVariants() {
		result = append(result, apexLsdumpTag)
		} else if headerAbiChecker.enabled() {
		}
		if headerAbiChecker.enabled() {
		result = append(result, platformLsdumpTag)
		}
		} else if headerAbiChecker.enabled() {