Merge changes I0bf0c186,I859cd636,Ie438d7a7,I30f82aea into main

* changes:
  Add and use staticLibrary()
  Convert WalkPayloadDeps from blueprint.Module to android.Module
  Remove AlwaysRequireApexVariantTag
  Move transition code to transition.go

1 files changed, 14 insertions, 0 deletions

diff --git a/cc/cc.go b/cc/cc.go
index 4838a5f5f..802332426 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -519,6 +519,7 @@ type VendorProperties struct {
 type ModuleContextIntf interface {
 	static() bool
 	staticBinary() bool
+	staticLibrary() bool
 	testBinary() bool
 	testLibrary() bool
 	header() bool
@@ -1523,6 +1524,10 @@ func (ctx *moduleContextImpl) staticBinary() bool {
 	return ctx.mod.staticBinary()
 }
 
+func (ctx *moduleContextImpl) staticLibrary() bool {
+	return ctx.mod.staticLibrary()
+}
+
 func (ctx *moduleContextImpl) testBinary() bool {
 	return ctx.mod.testBinary()
 }
@@ -3550,6 +3555,15 @@ func (c *Module) static() bool {
 	return false
 }
 
+func (c *Module) staticLibrary() bool {
+	if static, ok := c.linker.(interface {
+		staticLibrary() bool
+	}); ok {
+		return static.staticLibrary()
+	}
+	return false
+}
+
 func (c *Module) staticBinary() bool {
 	if static, ok := c.linker.(interface {
 		staticBinary() bool