From 84b6508604a48d12206f6d7081da59deb075127f Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Mon, 5 Feb 2024 10:17:48 +0900 Subject: 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 --- rust/androidmk.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'rust/androidmk.go') 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) }, -- cgit v1.2.3-59-g8ed1b