openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add flag test for cfi snapshot am: f7aadf70d8 am: 15f5c18550 am: ba6af75d83 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674225

Change-Id: I25ea400d3c331f60da288a01711da0445ae84eea
This commit is contained in:
Inseob Kim 2021-04-14 02:36:59 +00:00 committed by Automerger Merge Worker
parent 44a782d019 ba6af75d83
commit 5f06f3b36e
1 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
cc/vendor_snapshot_test.go
View File

@ -424,6 +424,20 @@ func TestVendorSnapshotUse(t *testing.T) {
srcs: ["client.cpp"],
}
cc_library_shared {
name: "libclient_cfi",
vendor: true,
nocrt: true,
no_libcrt: true,
stl: "none",
system_shared_libs: [],
static_libs: ["libvendor"],
sanitize: {
cfi: true,
},
srcs: ["client.cpp"],
}
cc_binary {
name: "bin_without_snapshot",
vendor: true,
@ -584,10 +598,18 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor: true,
arch: {
arm64: {
cfi: {
src: "libvendor.cfi.a",
export_include_dirs: ["include/libvendor_cfi"],
},
src: "libvendor.a",
export_include_dirs: ["include/libvendor"],
},
arm: {
cfi: {
src: "libvendor.cfi.a",
export_include_dirs: ["include/libvendor_cfi"],
},
src: "libvendor.a",
export_include_dirs: ["include/libvendor"],
},
@ -726,29 +748,31 @@ func TestVendorSnapshotUse(t *testing.T) {
depsBp := GatherRequiredDepsForTest(android.Android)
mockFS := map[string][]byte{
"deps/Android.bp": []byte(depsBp),
"framework/Android.bp": []byte(frameworkBp),
"framework/symbol.txt": nil,
"vendor/Android.bp": []byte(vendorProprietaryBp),
"vendor/bin": nil,
"vendor/bin32": nil,
"vendor/bin.cpp": nil,
"vendor/client.cpp": nil,
"vendor/include/libvndk/a.h": nil,
"vendor/include/libvendor/b.h": nil,
"vendor/libc++_static.a": nil,
"vendor/libc++demangle.a": nil,
"vendor/libgcc_striped.a": nil,
"vendor/libvndk.a": nil,
"vendor/libvendor.a": nil,
"vendor/libvendor.so": nil,
"vendor/lib32.a": nil,
"vendor/lib32.so": nil,
"vendor/lib64.a": nil,
"vendor/lib64.so": nil,
"vndk/Android.bp": []byte(vndkBp),
"vndk/include/libvndk/a.h": nil,
"vndk/libvndk.so": nil,
"deps/Android.bp": []byte(depsBp),
"framework/Android.bp": []byte(frameworkBp),
"framework/symbol.txt": nil,
"vendor/Android.bp": []byte(vendorProprietaryBp),
"vendor/bin": nil,
"vendor/bin32": nil,
"vendor/bin.cpp": nil,
"vendor/client.cpp": nil,
"vendor/include/libvndk/a.h": nil,
"vendor/include/libvendor/b.h": nil,
"vendor/include/libvendor_cfi/c.h": nil,
"vendor/libc++_static.a": nil,
"vendor/libc++demangle.a": nil,
"vendor/libgcc_striped.a": nil,
"vendor/libvndk.a": nil,
"vendor/libvendor.a": nil,
"vendor/libvendor.cfi.a": nil,
"vendor/libvendor.so": nil,
"vendor/lib32.a": nil,
"vendor/lib32.so": nil,
"vendor/lib64.a": nil,
"vendor/lib64.so": nil,
"vndk/Android.bp": []byte(vndkBp),
"vndk/include/libvndk/a.h": nil,
"vndk/libvndk.so": nil,
}
config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS)
@ -766,6 +790,9 @@ func TestVendorSnapshotUse(t *testing.T) {
staticVariant := "android_vendor.30_arm64_armv8-a_static"
binaryVariant := "android_vendor.30_arm64_armv8-a"
sharedCfiVariant := "android_vendor.30_arm64_armv8-a_shared_cfi"
staticCfiVariant := "android_vendor.30_arm64_armv8-a_static_cfi"
shared32Variant := "android_vendor.30_arm_armv7-a-neon_shared"
binary32Variant := "android_vendor.30_arm_armv7-a-neon"
@ -808,6 +835,19 @@ func TestVendorSnapshotUse(t *testing.T) {
t.Errorf("wanted libclient32 AndroidMkSharedLibs %q, got %q", w, g)
}
// libclient_cfi uses libvendor.vendor_static.30.arm64's cfi variant
libclientCfiCcFlags := ctx.ModuleForTests("libclient_cfi", sharedCfiVariant).Rule("cc").Args["cFlags"]
if !strings.Contains(libclientCfiCcFlags, "-Ivendor/include/libvendor_cfi") {
t.Errorf("flags for libclient_cfi must contain %#v, but was %#v.",
"-Ivendor/include/libvendor_cfi", libclientCfiCcFlags)
}
libclientCfiLdFlags := ctx.ModuleForTests("libclient_cfi", sharedCfiVariant).Rule("ld").Args["libFlags"]
libvendorCfiOutputPaths := getOutputPaths(ctx, staticCfiVariant, []string{"libvendor.vendor_static.30.arm64"})
if !strings.Contains(libclientCfiLdFlags, libvendorCfiOutputPaths[0].String()) {
t.Errorf("libflags for libclientCfi must contain %#v, but was %#v", libvendorCfiOutputPaths[0], libclientCfiLdFlags)
}
// bin_without_snapshot uses libvndk.vendor_static.30.arm64
binWithoutSnapshotCcFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("cc").Args["cFlags"]
if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivendor/include/libvndk") {