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

Merge "Remove versioned LLNDK stubs"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-01 18:38:52 +00:00
committed by Gerrit Code Review
parent c5e4a0750d c1b3644e91
commit ebdf61ece2
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/cc.go
View File

@@ -726,7 +726,6 @@ var (
runtimeDepTag = installDependencyTag{name: "runtime lib"} runtimeDepTag = installDependencyTag{name: "runtime lib"}
testPerSrcDepTag = dependencyTag{name: "test_per_src"} testPerSrcDepTag = dependencyTag{name: "test_per_src"}
stubImplDepTag = dependencyTag{name: "stub_impl"} stubImplDepTag = dependencyTag{name: "stub_impl"}
llndkStubDepTag = dependencyTag{name: "llndk stub"}
) )
func IsSharedDepTag(depTag blueprint.DependencyTag) bool { func IsSharedDepTag(depTag blueprint.DependencyTag) bool {
@@ -3238,8 +3237,8 @@ func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu
return false return false
} }
} }
if depTag == stubImplDepTag || depTag == llndkStubDepTag { if depTag == stubImplDepTag {
// We don't track beyond LLNDK or from an implementation library to its stubs. // We don't track from an implementation library to its stubs.
return false return false
} }
if depTag == staticVariantTag { if depTag == staticVariantTag {

7
cc/cc_test.go
View File

@@ -2799,12 +2799,8 @@ func TestLlndkLibrary(t *testing.T) {
} }
} }
expected := []string{ expected := []string{
"android_vendor.29_arm64_armv8-a_shared_1",
"android_vendor.29_arm64_armv8-a_shared_2",
"android_vendor.29_arm64_armv8-a_shared_current", "android_vendor.29_arm64_armv8-a_shared_current",
"android_vendor.29_arm64_armv8-a_shared", "android_vendor.29_arm64_armv8-a_shared",
"android_vendor.29_arm_armv7-a-neon_shared_1",
"android_vendor.29_arm_armv7-a-neon_shared_2",
"android_vendor.29_arm_armv7-a-neon_shared_current", "android_vendor.29_arm_armv7-a-neon_shared_current",
"android_vendor.29_arm_armv7-a-neon_shared", "android_vendor.29_arm_armv7-a-neon_shared",
} }
@@ -2813,9 +2809,6 @@ func TestLlndkLibrary(t *testing.T) {
params := result.ModuleForTests("libllndk", "android_vendor.29_arm_armv7-a-neon_shared").Description("generate stub") params := result.ModuleForTests("libllndk", "android_vendor.29_arm_armv7-a-neon_shared").Description("generate stub")
android.AssertSame(t, "use VNDK version for default stubs", "current", params.Args["apiLevel"]) android.AssertSame(t, "use VNDK version for default stubs", "current", params.Args["apiLevel"])
params = result.ModuleForTests("libllndk", "android_vendor.29_arm_armv7-a-neon_shared_1").Description("generate stub")
android.AssertSame(t, "override apiLevel for versioned stubs", "1", params.Args["apiLevel"])
checkExportedIncludeDirs := func(module, variant string, expectedDirs ...string) { checkExportedIncludeDirs := func(module, variant string, expectedDirs ...string) {
t.Helper() t.Helper()
m := result.ModuleForTests(module, variant).Module() m := result.ModuleForTests(module, variant).Module()

17
cc/library.go
View File

@@ -1813,6 +1813,11 @@ func (library *libraryDecorator) stubsVersions(ctx android.BaseMutatorContext) [
return nil return nil
} }
if library.hasLLNDKStubs() && ctx.Module().(*Module).UseVndk() {
// LLNDK libraries only need a single stubs variant.
return []string{android.FutureApiLevel.String()}
}
// Future API level is implicitly added if there isn't // Future API level is implicitly added if there isn't
vers := library.Properties.Stubs.Versions vers := library.Properties.Stubs.Versions
if inList(android.FutureApiLevel.String(), vers) { if inList(android.FutureApiLevel.String(), vers) {
@@ -2154,8 +2159,7 @@ func moduleLibraryInterface(module blueprint.Module) libraryInterface {
return nil return nil
} }
// versionSelector normalizes the versions in the Stubs.Versions property into MutatedProperties.AllStubsVersions, // versionSelector normalizes the versions in the Stubs.Versions property into MutatedProperties.AllStubsVersions.
// and propagates the value from implementation libraries to llndk libraries with the same name.
func versionSelectorMutator(mctx android.BottomUpMutatorContext) { func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
if library := moduleLibraryInterface(mctx.Module()); library != nil && CanBeVersionVariant(mctx.Module().(*Module)) { if library := moduleLibraryInterface(mctx.Module()); library != nil && CanBeVersionVariant(mctx.Module().(*Module)) {
if library.buildShared() { if library.buildShared() {
@@ -2169,15 +2173,6 @@ func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
// depend on the implementation library and haven't been mutated yet. // depend on the implementation library and haven't been mutated yet.
library.setAllStubsVersions(versions) library.setAllStubsVersions(versions)
} }
if mctx.Module().(*Module).UseVndk() && library.hasLLNDKStubs() {
// Propagate the version to the llndk stubs module.
mctx.VisitDirectDepsWithTag(llndkStubDepTag, func(stubs android.Module) {
if stubsLib := moduleLibraryInterface(stubs); stubsLib != nil {
stubsLib.setAllStubsVersions(library.allStubsVersions())
}
})
}
} }
} }
} }