diff options
| author | 2021-02-09 13:49:28 +0000 | |
|---|---|---|
| committer | 2021-02-09 13:49:28 +0000 | |
| commit | 4ccfcc2ee4471e08b5ab663db73ca88e681d6d46 (patch) | |
| tree | 52e6c79213edbce2653700afa768e669723aca84 /rust/rust.go | |
| parent | bb483cbcf58266a6a5292b6c80b503a23f5ca61b (diff) | |
| parent | e6d3098c1b95b94a9a7c03e9ade9b2cbf3ac10e2 (diff) | |
Merge "rust: Add rust_ffi_static vendor ramdisk Support"
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/rust/rust.go b/rust/rust.go index 0b733cc35..dc23abb8d 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -74,8 +74,16 @@ type BaseProperties struct { SubName string `blueprint:"mutated"` // Set by imageMutator - CoreVariantNeeded bool `blueprint:"mutated"` - ExtraVariants []string `blueprint:"mutated"` + CoreVariantNeeded bool `blueprint:"mutated"` + VendorRamdiskVariantNeeded bool `blueprint:"mutated"` + ExtraVariants []string `blueprint:"mutated"` + + // Make this module available when building for vendor ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead (TODO(b/165791368) recovery not yet supported) + Vendor_ramdisk_available *bool // Minimum sdk version that the artifact should support when it runs as part of mainline modules(APEX). Min_sdk_version *string @@ -658,7 +666,9 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { // Differentiate static libraries that are vendor available if mod.UseVndk() { - mod.Properties.SubName += ".vendor" + mod.Properties.SubName += cc.VendorSuffix + } else if mod.InVendorRamdisk() && !mod.OnlyInVendorRamdisk() { + mod.Properties.SubName += cc.VendorRamdiskSuffix } if !toolchain.Supported() { |