From b5fdb2e966bf6e819677e266eda27a8cb0a86d0c Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 3 Jan 2024 14:24:34 +0900 Subject: 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 --- rust/rust.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'rust/rust.go') 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 -- cgit v1.2.3-59-g8ed1b