From ed63c02e9bf00d5ff12a1ec177fab0a25d014103 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Fri, 2 Feb 2024 08:06:52 +0000 Subject: [PATCH] Revert "Rename LOCAL_USE_VNDK" Revert submission 2931430-local_use_vndk Reason for revert: build fails with barbet targets Reverted changes: /q/submissionid:2931430-local_use_vndk Change-Id: Ic5b850e2905d1b93e8b4d08921106940991587b8 --- cc/androidmk.go | 6 +----- rust/androidmk.go | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 20673e825..c39668c73 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -107,6 +107,7 @@ 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 @@ -116,11 +117,6 @@ 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 e0cb3ceae..17fd2d8be 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -63,10 +63,8 @@ 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.InVendor() { - entries.SetBool("LOCAL_IN_VENDOR", true) - } else if mod.InProduct() { - entries.SetBool("LOCAL_IN_PRODUCT", true) + if mod.UseVndk() { + entries.SetBool("LOCAL_USE_VNDK", true) } android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles) },