StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rust: Set android_vendor and android_product cfg am: 65a54a8e3d

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

Change-Id: If7601ef83f2c716c6d4a6a8c6ab51a1dd05df09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matthew Maurer
2023-02-25 02:04:36 +00:00
committed by Automerger Merge Worker
parent 0cede10365 65a54a8e3d
commit dfe3f37965
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rust/compiler.go
View File

@@ -269,6 +269,11 @@ func (compiler *baseCompiler) featureFlags(ctx ModuleContext, flags Flags) Flags
func (compiler *baseCompiler) cfgFlags(ctx ModuleContext, flags Flags) Flags { func (compiler *baseCompiler) cfgFlags(ctx ModuleContext, flags Flags) Flags {
if ctx.RustModule().UseVndk() { if ctx.RustModule().UseVndk() {
compiler.Properties.Cfgs = append(compiler.Properties.Cfgs, "android_vndk") compiler.Properties.Cfgs = append(compiler.Properties.Cfgs, "android_vndk")
if ctx.RustModule().InVendor() {
compiler.Properties.Cfgs = append(compiler.Properties.Cfgs, "android_vendor")
} else if ctx.RustModule().InProduct() {
compiler.Properties.Cfgs = append(compiler.Properties.Cfgs, "android_product")
}
} }
flags.RustFlags = append(flags.RustFlags, compiler.cfgsToFlags()...) flags.RustFlags = append(flags.RustFlags, compiler.cfgsToFlags()...)

30
rust/image_test.go
View File

@@ -53,6 +53,7 @@ func TestImageVndkCfgFlag(t *testing.T) {
crate_name: "foo", crate_name: "foo",
srcs: ["foo.rs"], srcs: ["foo.rs"],
vendor_available: true, vendor_available: true,
product_available: true,
} }
`) `)
@@ -61,6 +62,35 @@ func TestImageVndkCfgFlag(t *testing.T) {
if !strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_vndk'") { if !strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_vndk'") {
t.Errorf("missing \"--cfg 'android_vndk'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"]) t.Errorf("missing \"--cfg 'android_vndk'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"])
} }
if !strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_vendor'") {
t.Errorf("missing \"--cfg 'android_vendor'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"])
}
if strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_product'") {
t.Errorf("unexpected \"--cfg 'android_product'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"])
}
product := ctx.ModuleForTests("libfoo", "android_product.29_arm64_armv8-a_static").Rule("rustc")
if !strings.Contains(product.Args["rustcFlags"], "--cfg 'android_vndk'") {
t.Errorf("missing \"--cfg 'android_vndk'\" for libfoo product variant, rustcFlags: %#v", product.Args["rustcFlags"])
}
if strings.Contains(product.Args["rustcFlags"], "--cfg 'android_vendor'") {
t.Errorf("unexpected \"--cfg 'android_vendor'\" for libfoo product variant, rustcFlags: %#v", product.Args["rustcFlags"])
}
if !strings.Contains(product.Args["rustcFlags"], "--cfg 'android_product'") {
t.Errorf("missing \"--cfg 'android_product'\" for libfoo product variant, rustcFlags: %#v", product.Args["rustcFlags"])
}
system := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_static").Rule("rustc")
if strings.Contains(system.Args["rustcFlags"], "--cfg 'android_vndk'") {
t.Errorf("unexpected \"--cfg 'android_vndk'\" for libfoo system variant, rustcFlags: %#v", system.Args["rustcFlags"])
}
if strings.Contains(system.Args["rustcFlags"], "--cfg 'android_vendor'") {
t.Errorf("unexpected \"--cfg 'android_vendor'\" for libfoo system variant, rustcFlags: %#v", system.Args["rustcFlags"])
}
if strings.Contains(system.Args["rustcFlags"], "--cfg 'android_product'") {
t.Errorf("unexpected \"--cfg 'android_product'\" for libfoo system variant, rustcFlags: %#v", product.Args["rustcFlags"])
}
} }
// Test that cc modules can link against vendor_ramdisk_available rust_ffi_static libraries. // Test that cc modules can link against vendor_ramdisk_available rust_ffi_static libraries.