Merge "Differentiate between public and module-lib stub variants" am: 9e1117bf66 am: c78c37429f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536351

Change-Id: I31728fca2733bb7f4519327e8abf3fd8cc5e30b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cc/cc.go

@@ -1858,6 +1858,10 @@ func GetSubnameProperty(actx android.ModuleContext, c LinkableInterface) string
 		if c.SplitPerApiLevel() {
 			subName += "." + c.SdkVersion()
 		}
+	} else if c.IsStubs() && c.IsSdkVariant() {
+		// Public API surface (NDK)
+		// Add a suffix to this stub variant to distinguish it from the module-lib stub variant.
+		subName = sdkSuffix
 	}
 
 	return subName