diff --git a/cc/cc.go b/cc/cc.go
index ded89d4..062e6d9 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1175,15 +1175,9 @@
 			depTag = headerExportDepTag
 		}
 		if buildStubs {
-			imageVariation := "core"
-			if c.useVndk() {
-				imageVariation = "vendor"
-			} else if c.inRecovery() {
-				imageVariation = "recovery"
-			}
 			actx.AddFarVariationDependencies([]blueprint.Variation{
 				{Mutator: "arch", Variation: ctx.Target().String()},
-				{Mutator: "image", Variation: imageVariation},
+				{Mutator: "image", Variation: c.imageVariation()},
 			}, depTag, lib)
 		} else {
 			actx.AddVariationDependencies(nil, depTag, lib)
@@ -1845,6 +1839,16 @@
 	return false
 }
 
+func (c *Module) imageVariation() string {
+	variation := "core"
+	if c.useVndk() {
+		variation = "vendor"
+	} else if c.inRecovery() {
+		variation = "recovery"
+	}
+	return variation
+}
+
 //
 // Defaults
 //