Merge "cc/sabi.go: Propagate ShouldCreateSourceAbiDump to reuseObjTag deps"

cc/sabi.go

@@ -192,7 +192,7 @@ func sabiDepsMutator(mctx android.TopDownMutatorContext) {
 			// Mark all of its static library dependencies.
 			mctx.VisitDirectDeps(func(child android.Module) {
 				depTag := mctx.OtherModuleDependencyTag(child)
-				if libDepTag, ok := depTag.(libraryDependencyTag); ok && libDepTag.static() {
+				if IsStaticDepTag(depTag) || depTag == reuseObjTag {
 					if c, ok := child.(*Module); ok && c.sabi != nil {
 						// Mark this module so that .sdump for this static library can be generated.
 						c.sabi.Properties.ShouldCreateSourceAbiDump = true