From c511bc50dcaba95bf731bcc72ffbfab3805cacc6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 7 Apr 2020 16:50:32 +0000 Subject: Revert^2 "Add sdk mutator for native modules" f8e80229fedb47302e9cfd32990859a6308020cf Change-Id: Ic30ab6b844684bfc3e8ece5a1913980d5fbf8de2 --- java/app_test.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'java/app_test.go') diff --git a/java/app_test.go b/java/app_test.go index 0c6da7a47..fa18e9dac 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -791,6 +791,7 @@ func TestJNIABI(t *testing.T) { cc_library { name: "libjni", system_shared_libs: [], + sdk_version: "current", stl: "none", } @@ -928,26 +929,26 @@ func TestJNIPackaging(t *testing.T) { android_test { name: "test", - sdk_version: "core_platform", + sdk_version: "current", jni_libs: ["libjni"], } android_test { name: "test_noembed", - sdk_version: "core_platform", + sdk_version: "current", jni_libs: ["libjni"], use_embedded_native_libs: false, } android_test_helper_app { name: "test_helper", - sdk_version: "core_platform", + sdk_version: "current", jni_libs: ["libjni"], } android_test_helper_app { name: "test_helper_noembed", - sdk_version: "core_platform", + sdk_version: "current", jni_libs: ["libjni"], use_embedded_native_libs: false, } @@ -979,6 +980,10 @@ 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()) + } } }) } -- cgit v1.2.3-59-g8ed1b