StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reapply "Rename LOCAL_USE_VNDK"

Browse Source 
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
This commit is contained in:
Kiyoung Kim
2024-02-05 10:17:48 +09:00
parent e5ed34746e
commit 84b6508604
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/androidmk.go
View File

@@ -107,7 +107,6 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
} }
entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType) entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType)
if c.InVendorOrProduct() { if c.InVendorOrProduct() {
entries.SetBool("LOCAL_USE_VNDK", true)
if c.IsVndk() && !c.static() { if c.IsVndk() && !c.static() {
entries.SetString("LOCAL_SOONG_VNDK_VERSION", c.VndkVersion()) entries.SetString("LOCAL_SOONG_VNDK_VERSION", c.VndkVersion())
// VNDK libraries available to vendor are not installed because // 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 { if c.Properties.IsSdkVariant && c.Properties.SdkAndPlatformVariantVisibleToMake {
// Make the SDK variant uninstallable so that there are not two rules to install // Make the SDK variant uninstallable so that there are not two rules to install
// to the same location. // to the same location.

6
rust/androidmk.go
View File

@@ -63,8 +63,10 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.transitiveAndroidMkSharedLibs.ToList()...) entries.AddStrings("LOCAL_SHARED_LIBRARIES", mod.transitiveAndroidMkSharedLibs.ToList()...)
entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...) entries.AddStrings("LOCAL_STATIC_LIBRARIES", mod.Properties.AndroidMkStaticLibs...)
entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType) entries.AddStrings("LOCAL_SOONG_LINK_TYPE", mod.makeLinkType)
if mod.UseVndk() { if mod.InVendor() {
entries.SetBool("LOCAL_USE_VNDK", true) entries.SetBool("LOCAL_IN_VENDOR", true)
} else if mod.InProduct() {
entries.SetBool("LOCAL_IN_PRODUCT", true)
} }
android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles) android.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles)
}, },