diff options
| author | 2024-02-05 10:17:48 +0900 | |
|---|---|---|
| committer | 2024-02-05 10:31:23 +0900 | |
| commit | 84b6508604a48d12206f6d7081da59deb075127f (patch) | |
| tree | 69df827ed83603f4f0661bffd98910a2617e4971 /rust/androidmk.go | |
| parent | e5ed34746e5556eb6e0fd6c39d990e17dd0b49b2 (diff) | |
Reapply "Rename LOCAL_USE_VNDK"
Similar with aosp/2897612, rename LOCAL_USE_VNDK into
LOCAL_IN_VENDOR or LOCAL_IN_PRODUCT to make variable useful from
VNDK deprecation.
Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: If7bead24add014ed9e0e9e1d265b0199b911be89
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index 17fd2d8be..e0cb3ceae 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -63,8 +63,10 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.transitiveAndroidMkSharedLibs.ToList()...) 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) + if mod.InVendor() { + entries.SetBool("LOCAL_IN_VENDOR", true) + } else if mod.InProduct() { + entries.SetBool("LOCAL_IN_PRODUCT", true) } android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles) }, |