StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't rewrite LLNDK dependencies with .llndk suffix

Browse Source 
Rewriting LLNDK dependencies with .llndk suffix requries referencing
a global data structure to determine if a given library is an LLNDK
library and therefore needs the .llndk suffix.  References to
global data structures from mutators must be removed to support
incremental Soong analysis.  Instead, move the LLNDK stubs rules
into the vendor variant of the implementing cc_library so that
the original name can be used.

As an incremental step, the llndk_library modules are left in
place, and the properties are copied into the cc_library via
the dependency specified by the llndk_stub property.  A followup
will move the LLNDK properties directly into the cc_library and
delete the llndk_library modules.

The global list of LLNDK libraries is kept for now as it is used
to generate the vndk.libraries.txt file.

Bug: 170784825
Test: m checkbuild
Test: compare Soong outputs
Test: all Soong tests
Change-Id: I2a942b21c162541a49e27b2e5833c9aebccff1d0
This commit is contained in:
Colin Cross
2020-12-16 16:46:01 -08:00
parent adc81a0783
commit 127bb8b9f6
15 changed files with 344 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/sabi.go
View File

@@ -80,10 +80,10 @@ func classifySourceAbiDump(ctx android.BaseModuleContext) string {
if m.IsNdk(ctx.Config()) {
return "NDK"
}
if m.isLlndkPublic(ctx.Config()) {
if m.isImplementationForLLNDKPublic() {
return "LLNDK"
}
if m.UseVndk() && m.IsVndk() && !m.IsVndkPrivate(ctx.Config()) {
if m.UseVndk() && m.IsVndk() && !m.IsVndkPrivate() {
if m.isVndkSp() {
if m.IsVndkExt() {
return "VNDK-SP-ext"
@@ -156,7 +156,7 @@ func shouldCreateSourceAbiDumpForLibrary(ctx android.BaseModuleContext) bool {
}
// Don't create ABI dump for stubs.
if m.isNDKStubLibrary() || m.IsStubs() {
if m.isNDKStubLibrary() || m.IsLlndk() || m.IsStubs() {
return false
}