Merge "Fix: stubs lib is installed in APEX"

am: f17284e05d

Change-Id: I56b89e36a260bf0cb1792285b0eddda775523772

apex/apex_test.go

@@ -664,5 +664,5 @@ func TestStaticLinking(t *testing.T) {
 	ldFlags := ctx.ModuleForTests("not_in_apex", "android_arm64_armv8-a_core").Rule("ld").Args["libFlags"]
 
 	// Ensure that not_in_apex is linking with the static variant of mylib
-	ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static/mylib.a")
+	ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static_platform/mylib.a")
 }

cc/library.go

@@ -1059,7 +1059,7 @@ func VersionMutator(mctx android.BottomUpMutatorContext) {
 			stubsVersionsFor(mctx.Config())[mctx.ModuleName()] = copiedVersions
 
 			// "" is for the non-stubs variant
-			versions = append(versions, "")
+			versions = append([]string{""}, versions...)
 
 			modules := mctx.CreateVariations(versions...)
 			for i, m := range modules {