63e9ec70bb
To make a module available to product variants, it must define `product_available: true`. `vendor_available: true` will not create product variants any more. However, in this CL, we don't change the behavior of `vendor_available` property. It still creates both variants. After we update all Android.bp files that need to provide product variants with `product_available: true`, we may upload the remaining patches. Bug: 150902910 Test: lunch aosp_arm64-userdebug && m Change-Id: I0fd5be7bbae2c45d5cab3c3c2ca49f53a9b6f975
134 lines
3.5 KiB
Go
134 lines
3.5 KiB
Go
package apex
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/google/blueprint/proptools"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
func TestVndkApexForVndkLite(t *testing.T) {
|
|
ctx, _ := testApex(t, `
|
|
apex_vndk {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
}
|
|
|
|
apex_key {
|
|
name: "myapex.key",
|
|
public_key: "testkey.avbpubkey",
|
|
private_key: "testkey.pem",
|
|
}
|
|
|
|
cc_library {
|
|
name: "libvndk",
|
|
srcs: ["mylib.cpp"],
|
|
vendor_available: true,
|
|
product_available: true,
|
|
vndk: {
|
|
enabled: true,
|
|
},
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
apex_available: [ "myapex" ],
|
|
}
|
|
|
|
cc_library {
|
|
name: "libvndksp",
|
|
srcs: ["mylib.cpp"],
|
|
vendor_available: true,
|
|
product_available: true,
|
|
vndk: {
|
|
enabled: true,
|
|
support_system_process: true,
|
|
},
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
apex_available: [ "myapex" ],
|
|
}
|
|
`+vndkLibrariesTxtFiles("current"), func(fs map[string][]byte, config android.Config) {
|
|
config.TestProductVariables.DeviceVndkVersion = proptools.StringPtr("")
|
|
})
|
|
// VNDK-Lite contains only core variants of VNDK-Sp libraries
|
|
ensureExactContents(t, ctx, "myapex", "android_common_image", []string{
|
|
"lib/libvndksp.so",
|
|
"lib/libc++.so",
|
|
"lib64/libvndksp.so",
|
|
"lib64/libc++.so",
|
|
"etc/llndk.libraries.VER.txt",
|
|
"etc/vndkcore.libraries.VER.txt",
|
|
"etc/vndksp.libraries.VER.txt",
|
|
"etc/vndkprivate.libraries.VER.txt",
|
|
})
|
|
}
|
|
|
|
func TestVndkApexUsesVendorVariant(t *testing.T) {
|
|
bp := `
|
|
apex_vndk {
|
|
name: "myapex",
|
|
key: "mykey",
|
|
}
|
|
apex_key {
|
|
name: "mykey",
|
|
}
|
|
cc_library {
|
|
name: "libfoo",
|
|
vendor_available: true,
|
|
product_available: true,
|
|
vndk: {
|
|
enabled: true,
|
|
},
|
|
system_shared_libs: [],
|
|
stl: "none",
|
|
notice: "custom_notice",
|
|
}
|
|
` + vndkLibrariesTxtFiles("current")
|
|
|
|
ensureFileSrc := func(t *testing.T, files []fileInApex, path, src string) {
|
|
t.Helper()
|
|
for _, f := range files {
|
|
if f.path == path {
|
|
ensureContains(t, f.src, src)
|
|
return
|
|
}
|
|
}
|
|
t.Fail()
|
|
}
|
|
|
|
t.Run("VNDK lib doesn't have an apex variant", func(t *testing.T) {
|
|
ctx, _ := testApex(t, bp)
|
|
|
|
// libfoo doesn't have apex variants
|
|
for _, variant := range ctx.ModuleVariantsForTests("libfoo") {
|
|
ensureNotContains(t, variant, "_myapex")
|
|
}
|
|
|
|
// VNDK APEX doesn't create apex variant
|
|
files := getFiles(t, ctx, "myapex", "android_common_image")
|
|
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so")
|
|
})
|
|
|
|
t.Run("VNDK APEX gathers only vendor variants even if product variants are available", func(t *testing.T) {
|
|
ctx, _ := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
|
// Now product variant is available
|
|
config.TestProductVariables.ProductVndkVersion = proptools.StringPtr("current")
|
|
})
|
|
|
|
files := getFiles(t, ctx, "myapex", "android_common_image")
|
|
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so")
|
|
})
|
|
|
|
t.Run("VNDK APEX supports coverage variants", func(t *testing.T) {
|
|
ctx, _ := testApex(t, bp, func(fs map[string][]byte, config android.Config) {
|
|
config.TestProductVariables.GcovCoverage = proptools.BoolPtr(true)
|
|
config.TestProductVariables.Native_coverage = proptools.BoolPtr(true)
|
|
})
|
|
|
|
files := getFiles(t, ctx, "myapex", "android_common_image")
|
|
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so")
|
|
|
|
files = getFiles(t, ctx, "myapex", "android_common_cov_image")
|
|
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared_cov/libfoo.so")
|
|
})
|
|
}
|