From 84b6508604a48d12206f6d7081da59deb075127f Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Mon, 5 Feb 2024 10:17:48 +0900 Subject: [PATCH] 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 --- cc/androidmk.go | 6 +++++- rust/androidmk.go | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index c39668c73..20673e825 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -107,7 +107,6 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { } entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType) if c.InVendorOrProduct() { - entries.SetBool("LOCAL_USE_VNDK", true) if c.IsVndk() && !c.static() { entries.SetString("LOCAL_SOONG_VNDK_VERSION", c.VndkVersion()) // VNDK libraries available to vendor are not installed because @@ -117,6 +116,11 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { } } } + if c.InVendor() { + entries.SetBool("LOCAL_IN_VENDOR", true) + } else if c.InProduct() { + entries.SetBool("LOCAL_IN_PRODUCT", true) + } if c.Properties.IsSdkVariant && c.Properties.SdkAndPlatformVariantVisibleToMake { // Make the SDK variant uninstallable so that there are not two rules to install // to the same location. 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) },