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

Merge "Revert "Rename LOCAL_USE_VNDK"" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-02-02 10:38:49 +00:00
committed by Gerrit Code Review
parent 14b5f6e05b ed63c02e9b
commit 0e5f6e4e9f
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/androidmk.go
View File

@@ -107,6 +107,7 @@ 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
@@ -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 { 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,10 +63,8 @@ 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.InVendor() { if mod.UseVndk() {
entries.SetBool("LOCAL_IN_VENDOR", true) entries.SetBool("LOCAL_USE_VNDK", 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)
}, },