apex: Remove apexPackagingMutator
Bug: 279835185 Test: m Change-Id: I2f5293a5a86d2ea66c1107659abc2e746fe2775e
This commit is contained in:
@@ -55,7 +55,7 @@ func TestVndkApexForVndkLite(t *testing.T) {
|
||||
}),
|
||||
)
|
||||
// VNDK-Lite contains only core variants of VNDK-Sp libraries
|
||||
ensureExactContents(t, ctx, "com.android.vndk.current", "android_common_image", []string{
|
||||
ensureExactContents(t, ctx, "com.android.vndk.current", "android_common", []string{
|
||||
"lib/libvndksp.so",
|
||||
"lib/libc++.so",
|
||||
"lib64/libvndksp.so",
|
||||
@@ -110,7 +110,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
}
|
||||
|
||||
// VNDK APEX doesn't create apex variant
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common")
|
||||
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
|
||||
})
|
||||
|
||||
@@ -122,7 +122,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
}),
|
||||
)
|
||||
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common")
|
||||
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
|
||||
})
|
||||
|
||||
@@ -134,10 +134,10 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
|
||||
}),
|
||||
)
|
||||
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
|
||||
files := getFiles(t, ctx, "com.android.vndk.current", "android_common")
|
||||
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
|
||||
|
||||
files = getFiles(t, ctx, "com.android.vndk.current", "android_common_cov_image")
|
||||
files = getFiles(t, ctx, "com.android.vndk.current", "android_common_cov")
|
||||
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared_cov/libfoo.so")
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user