diff options
| author | 2024-01-29 13:20:45 +0900 | |
|---|---|---|
| committer | 2024-01-30 16:52:10 +0900 | |
| commit | 1132b8cdaad2439a45904a977a6da8ed831f7995 (patch) | |
| tree | 96639168726711cdf7fbf88667e926e0fb79a4bb | |
| parent | 59739666e62b523b81c3c891fbc02cc7b6a7b37c (diff) | |
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: I76741e45a2d80000adec6abfd8e9d6ee97c4ea23
| -rw-r--r-- | cc/androidmk.go | 6 | ||||
| -rw-r--r-- | 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) }, |