diff options
| author | 2024-01-03 14:24:34 +0900 | |
|---|---|---|
| committer | 2024-01-05 11:15:23 +0900 | |
| commit | b5fdb2e966bf6e819677e266eda27a8cb0a86d0c (patch) | |
| tree | 95f3897c0e86ec61e05b053f8a21cbcaadd245e0 /rust/rust.go | |
| parent | 202bc5b689ed7f5deaf997c78347f64bfc19dce5 (diff) | |
Generate image variation without version
Current CC/Rust Image variations are generated with target VNDK version.
However, this is no longer valid if VNDK is deprecated. This change
generates image variation without version ("vendor", "product") if VNDK
is deprecated.
Bug: 316829758
Test: m nothing --no-skip-soong-tests passed
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I2387ed8a2632bfd9462621f882a947695ae1653d
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rust/rust.go b/rust/rust.go index 6f4631de7..34ce4c545 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -20,6 +20,7 @@ import ( "android/soong/bloaty" "android/soong/testing" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -69,9 +70,9 @@ type BaseProperties struct { AndroidMkProcMacroLibs []string `blueprint:"mutated"` AndroidMkStaticLibs []string `blueprint:"mutated"` - ImageVariationPrefix string `blueprint:"mutated"` - VndkVersion string `blueprint:"mutated"` - SubName string `blueprint:"mutated"` + ImageVariation string `blueprint:"mutated"` + VndkVersion string `blueprint:"mutated"` + SubName string `blueprint:"mutated"` // SubName is used by CC for tracking image variants / SDK versions. RustSubName is used for Rust-specific // subnaming which shouldn't be visible to CC modules (such as the rlib stdlinkage subname). This should be |