Merge "Revert "Add sdk mutator for native modules"" am: d66b121000 am: 193bdf5784

Change-Id: Id45f244ee8a091e31be765b48f3e173bbf6d00fd

java/app.go

@@ -214,13 +214,6 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
 	for _, jniTarget := range ctx.MultiTargets() {
 		variation := append(jniTarget.Variations(),
 			blueprint.Variation{Mutator: "link", Variation: "shared"})
-
-		// If the app builds against an Android SDK use the SDK variant of JNI dependencies
-		// unless jni_uses_platform_apis is set.
-		if a.sdkVersion().specified() && a.sdkVersion().kind != sdkCorePlatform &&
-			!Bool(a.appProperties.Jni_uses_platform_apis) {
-			variation = append(variation, blueprint.Variation{Mutator: "sdk", Variation: "sdk"})
-		}
 		ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...)
 	}
 

java/app_test.go

@@ -791,7 +791,6 @@ func TestJNIABI(t *testing.T) {
 		cc_library {
 			name: "libjni",
 			system_shared_libs: [],
-			sdk_version: "current",
 			stl: "none",
 		}
 
@@ -929,26 +928,26 @@ func TestJNIPackaging(t *testing.T) {
 
 		android_test {
 			name: "test",
-			sdk_version: "current",
+			sdk_version: "core_platform",
 			jni_libs: ["libjni"],
 		}
 
 		android_test {
 			name: "test_noembed",
-			sdk_version: "current",
+			sdk_version: "core_platform",
 			jni_libs: ["libjni"],
 			use_embedded_native_libs: false,
 		}
 
 		android_test_helper_app {
 			name: "test_helper",
-			sdk_version: "current",
+			sdk_version: "core_platform",
 			jni_libs: ["libjni"],
 		}
 
 		android_test_helper_app {
 			name: "test_helper_noembed",
-			sdk_version: "current",
+			sdk_version: "core_platform",
 			jni_libs: ["libjni"],
 			use_embedded_native_libs: false,
 		}
@@ -980,10 +979,6 @@ func TestJNIPackaging(t *testing.T) {
 				if g, w := !strings.Contains(jniLibZip.Args["jarArgs"], "-L 0"), test.compressed; g != w {
 					t.Errorf("expected jni compressed %v, got %v", w, g)
 				}
-
-				if !strings.Contains(jniLibZip.Implicits[0].String(), "_sdk_") {
-					t.Errorf("expected input %q to use sdk variant", jniLibZip.Implicits[0].String())
-				}
 			}
 		})
 	}