Use libraryInterface instead of concrete type asserts for stubs
Start consolidating stubs, llndk stubs, and ndk stubs by replacing
all of the concrete type asserts in the stubs methods with
libraryInterface.
Test: no change to build.ninja, Android-${TARGET_PRODUCT}.mk
Change-Id: I195d99c91e5f7afda5bcb489d20b524b3300c1b1
diff --git a/cc/cc.go b/cc/cc.go
index 8560042..8235e35 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -719,13 +719,8 @@
}
func (c *Module) StubsVersions() []string {
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return library.Properties.Stubs.Versions
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return library.Properties.Stubs.Versions
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.stubsVersions()
}
panic(fmt.Errorf("StubsVersions called on non-library module: %q", c.BaseModuleName()))
}
@@ -754,100 +749,48 @@
}
func (c *Module) SetBuildStubs() {
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- library.MutatedProperties.BuildStubs = true
- c.Properties.HideFromMake = true
- c.sanitize = nil
- c.stl = nil
- c.Properties.PreventInstall = true
- return
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- library.MutatedProperties.BuildStubs = true
- c.Properties.HideFromMake = true
- c.sanitize = nil
- c.stl = nil
- c.Properties.PreventInstall = true
- return
- }
- if _, ok := c.linker.(*llndkStubDecorator); ok {
- c.Properties.HideFromMake = true
- return
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ versioned.setBuildStubs()
+ c.Properties.HideFromMake = true
+ c.sanitize = nil
+ c.stl = nil
+ c.Properties.PreventInstall = true
+ return
}
panic(fmt.Errorf("SetBuildStubs called on non-library module: %q", c.BaseModuleName()))
}
func (c *Module) BuildStubs() bool {
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return library.buildStubs()
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return library.buildStubs()
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.buildStubs()
}
panic(fmt.Errorf("BuildStubs called on non-library module: %q", c.BaseModuleName()))
}
func (c *Module) SetAllStubsVersions(versions []string) {
- if library, ok := c.linker.(*libraryDecorator); ok {
- library.MutatedProperties.AllStubsVersions = versions
- return
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- library.MutatedProperties.AllStubsVersions = versions
- return
- }
- if llndk, ok := c.linker.(*llndkStubDecorator); ok {
- llndk.libraryDecorator.MutatedProperties.AllStubsVersions = versions
- return
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ versioned.setAllStubsVersions(versions)
}
}
func (c *Module) AllStubsVersions() []string {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return library.MutatedProperties.AllStubsVersions
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return library.MutatedProperties.AllStubsVersions
- }
- if llndk, ok := c.linker.(*llndkStubDecorator); ok {
- return llndk.libraryDecorator.MutatedProperties.AllStubsVersions
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.allStubsVersions()
}
return nil
}
func (c *Module) SetStubsVersion(version string) {
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- library.MutatedProperties.StubsVersion = version
- return
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- library.MutatedProperties.StubsVersion = version
- return
- }
- if llndk, ok := c.linker.(*llndkStubDecorator); ok {
- llndk.libraryDecorator.MutatedProperties.StubsVersion = version
- return
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ versioned.setStubsVersion(version)
+ return
}
panic(fmt.Errorf("SetStubsVersion called on non-library module: %q", c.BaseModuleName()))
}
func (c *Module) StubsVersion() string {
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return library.MutatedProperties.StubsVersion
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return library.MutatedProperties.StubsVersion
- }
- if llndk, ok := c.linker.(*llndkStubDecorator); ok {
- return llndk.libraryDecorator.MutatedProperties.StubsVersion
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.stubsVersion()
}
panic(fmt.Errorf("StubsVersion called on non-library module: %q", c.BaseModuleName()))
}
@@ -1085,22 +1028,15 @@
}
func (c *Module) IsStubs() bool {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return library.buildStubs()
- } else if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return library.buildStubs()
- } else if _, ok := c.linker.(*llndkStubDecorator); ok {
- return true
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.buildStubs()
}
return false
}
func (c *Module) HasStubsVariants() bool {
- if library, ok := c.linker.(*libraryDecorator); ok {
- return len(library.Properties.Stubs.Versions) > 0
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- return len(library.Properties.Stubs.Versions) > 0
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ return versioned.hasStubsVariants()
}
return false
}
@@ -1872,16 +1808,9 @@
}
buildStubs := false
- if c.linker != nil {
- if library, ok := c.linker.(*libraryDecorator); ok {
- if library.buildStubs() {
- buildStubs = true
- }
- }
- if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
- if library.buildStubs() {
- buildStubs = true
- }
+ if versioned, ok := c.linker.(versionedInterface); ok {
+ if versioned.buildStubs() {
+ buildStubs = true
}
}
diff --git a/cc/library.go b/cc/library.go
index 3a46b11..ac97168 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -678,6 +678,21 @@
availableFor(string) bool
}
+type versionedInterface interface {
+ buildStubs() bool
+ setBuildStubs()
+ hasStubsVariants() bool
+ setStubsVersion(string)
+ stubsVersion() string
+
+ stubsVersions() []string
+ setAllStubsVersions([]string)
+ allStubsVersions() []string
+}
+
+var _ libraryInterface = (*libraryDecorator)(nil)
+var _ versionedInterface = (*libraryDecorator)(nil)
+
func (library *libraryDecorator) getLibNameHelper(baseModuleName string, useVndk bool) string {
name := library.libName
if name == "" {
@@ -1350,10 +1365,34 @@
return nil
}
+func (library *libraryDecorator) hasStubsVariants() bool {
+ return len(library.Properties.Stubs.Versions) > 0
+}
+
+func (library *libraryDecorator) stubsVersions() []string {
+ return library.Properties.Stubs.Versions
+}
+
+func (library *libraryDecorator) setStubsVersion(version string) {
+ library.MutatedProperties.StubsVersion = version
+}
+
func (library *libraryDecorator) stubsVersion() string {
return library.MutatedProperties.StubsVersion
}
+func (library *libraryDecorator) setBuildStubs() {
+ library.MutatedProperties.BuildStubs = true
+}
+
+func (library *libraryDecorator) setAllStubsVersions(versions []string) {
+ library.MutatedProperties.AllStubsVersions = versions
+}
+
+func (library *libraryDecorator) allStubsVersions() []string {
+ return library.MutatedProperties.AllStubsVersions
+}
+
func (library *libraryDecorator) isLatestStubVersion() bool {
versions := library.Properties.Stubs.Versions
return versions[len(versions)-1] == library.stubsVersion()
@@ -1596,8 +1635,20 @@
// and propagates the value from implementation libraries to llndk libraries with the same name.
func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
if library, ok := mctx.Module().(LinkableInterface); ok && CanBeVersionVariant(library) {
- if library.CcLibrary() && library.BuildSharedVariant() && len(library.StubsVersions()) > 0 {
+ if c, ok := library.(*Module); ok {
+ if _, ok := c.linker.(*llndkStubDecorator); ok {
+ // Get the versions from the implementation module.
+ impls := mctx.GetDirectDepsWithTag(llndkImplDep)
+ if len(impls) > 1 {
+ panic(fmt.Errorf("Expected single implmenetation library, got %d", len(impls)))
+ } else if len(impls) == 1 {
+ c.SetAllStubsVersions(impls[0].(*Module).AllStubsVersions())
+ }
+ return
+ }
+ }
+ if library.CcLibrary() && library.BuildSharedVariant() && len(library.StubsVersions()) > 0 {
versions := library.StubsVersions()
normalizeVersions(mctx, versions)
if mctx.Failed() {
@@ -1609,15 +1660,6 @@
return
}
- if c, ok := library.(*Module); ok && c.IsStubs() {
- // Get the versions from the implementation module.
- impls := mctx.GetDirectDepsWithTag(llndkImplDep)
- if len(impls) > 1 {
- panic(fmt.Errorf("Expected single implmenetation library, got %d", len(impls)))
- } else if len(impls) == 1 {
- c.SetAllStubsVersions(impls[0].(*Module).AllStubsVersions())
- }
- }
}
}
diff --git a/cc/llndk_library.go b/cc/llndk_library.go
index a429063..3b8b47d 100644
--- a/cc/llndk_library.go
+++ b/cc/llndk_library.go
@@ -19,13 +19,9 @@
"strings"
"android/soong/android"
-
- "github.com/google/blueprint"
)
-var llndkImplDep = struct {
- blueprint.DependencyTag
-}{}
+var llndkImplDep = dependencyTag{name: "llndk impl"}
var (
llndkLibrarySuffix = ".llndk"
@@ -181,6 +177,12 @@
return false
}
+func (stub *llndkStubDecorator) buildStubs() bool {
+ return true
+}
+
+func (stub *llndkStubDecorator) setBuildStubs() {}
+
func NewLLndkStubLibrary() *Module {
module, library := NewLibrary(android.DeviceSupported)
library.BuildOnlyShared()