Revert "Add sdk mutator for native modules"
Revert submission 1242911-sdk_version_variant Reason for revert: b/153394225 Reverted Changes: Ife99745fb:Use libnativewindow for platform variant of libagq... I1bae84c43:Use libnativewindow for platform variant of androi... I6e6021ed3:Use stl to depend on libc++ Ife99745fb:Use libnativewindow for platform variant of libRSS... I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi... I7d72934aa:Add sdk mutator for native modules Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE... Bug: 149591340 Change-Id: I798fa902c779469c6382b6699351e5d12bf14785 Fixes: 153394225
This commit is contained in:
@@ -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())
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user