summaryrefslogtreecommitdiff
path: root/rust/androidmk.go
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2021-04-14 19:02:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-14 19:02:49 +0000
commitd466b4a1f5ab2b1553bb3b6ed849e006713d9f31 (patch)
tree7b86cc8b71d47b03e1fce90bb179bb16dbbb0a4b /rust/androidmk.go
parente8dfbdfb59ba807b809c368c604b684157747b46 (diff)
parentc08897c1e442be2e0f6db99ca310c9dc7c2e3194 (diff)
Merge changes from topic "rust_vendor_support"
* changes: Add more Rust vendor image support. rust: Use new common image mutator interface.
Diffstat (limited to 'rust/androidmk.go')
-rw-r--r--rust/androidmk.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go
index 940710e63..5f89d73c7 100644
--- a/rust/androidmk.go
+++ b/rust/androidmk.go
@@ -60,6 +60,10 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.Properties.AndroidMkSharedLibs...)
entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...)
entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType)
+ if mod.UseVndk() {
+ entries.SetBool("LOCAL_USE_VNDK", true)
+ }
+
},
},
}
@@ -75,6 +79,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
mod.SubAndroidMk(&ret, mod.sanitize)
}
+ ret.SubName += mod.Properties.RustSubName
ret.SubName += mod.Properties.SubName
return []android.AndroidMkEntries{ret}