openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Include shared lib in vendor snapshot if isVndkExt"

This commit is contained in:
Inseob Kim 2020-07-02 07:42:16 +00:00 committed by Gerrit Code Review
parent fae9e0cf9a 7d3f096cf4
commit a04db44964
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cc/vendor_snapshot.go
View File

@ -569,7 +569,13 @@ func isVendorSnapshotModule(m *Module, moduleDir string) bool {
return m.outputFile.Valid() && proptools.BoolDefault(m.VendorProperties.Vendor_available, true)
}
if l.shared() {
return m.outputFile.Valid() && !m.IsVndk()
if !m.outputFile.Valid() {
return false
}
if !m.IsVndk() {
return true
}
return m.isVndkExt()
}
return true
}
@ -669,7 +675,16 @@ func (c *vendorSnapshotSingleton) GenerateBuildActions(ctx android.SingletonCont
// Common properties among snapshots.
prop.ModuleName = ctx.ModuleName(m)
prop.RelativeInstallPath = m.RelativeInstallPath()
if m.isVndkExt() {
// vndk exts are installed to /vendor/lib(64)?/vndk(-sp)?
if m.isVndkSp() {
prop.RelativeInstallPath = "vndk-sp"
} else {
prop.RelativeInstallPath = "vndk"
}
} else {
prop.RelativeInstallPath = m.RelativeInstallPath()
}
prop.RuntimeLibs = m.Properties.SnapshotRuntimeLibs
prop.Required = m.RequiredModuleNames()
for _, path := range m.InitRc() {