tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Ensure opt-in platform ABI dumps are configured with ref_dump_dirs" into main

Browse source
This commit is contained in:
Hsin-Yi Chen 2024-05-13 03:01:44 +00:00 committed by Gerrit Code Review
commit d75bc49454
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cc/library.go
View file

@ -1490,6 +1490,11 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathD
fileName, nameExt, isLlndk) 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. // Check against the opt-in reference dumps.
for i, optInDumpDir := range headerAbiChecker.Ref_dump_dirs { for i, optInDumpDir := range headerAbiChecker.Ref_dump_dirs {
optInDumpDirPath := android.PathForModuleSrc(ctx, optInDumpDir) optInDumpDirPath := android.PathForModuleSrc(ctx, optInDumpDir)

6
cc/sabi.go
View file

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