diff options
| author | 2023-03-16 10:36:16 +0900 | |
|---|---|---|
| committer | 2023-03-16 11:05:41 +0900 | |
| commit | 24b246a7a884eb6963f5dfa0f22d82c371e51984 (patch) | |
| tree | 4db5d8f8f600db6b987890fab886962293049a9c /rust/androidmk.go | |
| parent | eabe937355676de6490cfa6804b279e66919a252 (diff) | |
Fix the make name of rust snapshots
Rust snapshot must have proper suffix for androidmk to avoid conflict
with the existing modules.
Bug: 230780263
Bug: 235895567
Test: m nothing
Change-Id: I35794196553621cd722c067d7965b2a61aa351bd
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index 20e991967..5e680b03d 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -43,6 +43,10 @@ func (mod *Module) SubAndroidMk(data *android.AndroidMkEntries, obj interface{}) } } +func (mod *Module) AndroidMkSuffix() string { + return mod.Properties.RustSubName + mod.Properties.SubName +} + func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { if mod.Properties.HideFromMake || mod.hideApexVariantFromMake { @@ -79,8 +83,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { mod.SubAndroidMk(&ret, mod.sanitize) } - ret.SubName += mod.Properties.RustSubName - ret.SubName += mod.Properties.SubName + ret.SubName += mod.AndroidMkSuffix() return []android.AndroidMkEntries{ret} } @@ -152,6 +155,11 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An }) } +func (library *snapshotLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { + ctx.SubAndroidMk(ret, library.libraryDecorator) + ret.SubName = library.SnapshotAndroidMkSuffix() +} + func (procMacro *procMacroDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { ctx.SubAndroidMk(ret, procMacro.baseCompiler) |