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

Merge "Rename LOCAL_USE_VNDK" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-02-02 02:48:35 +00:00
committed by Gerrit Code Review
parent c240996829 1132b8cdaa
commit 838b29ebc7
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)
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.