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

Merge "Include shared lib in vendor snapshot if isVndkExt" into rvc-dev am: 4c845264a2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12039614

Change-Id: I66fce942d2aef4bd5d65d723c8c02f867b3e80bb
This commit is contained in:
Inseob Kim
2020-07-01 07:58:48 +00:00
committed by Automerger Merge Worker
parent f2d0ec2e7e 4c845264a2
commit 9338e93cf7
1 changed files with 17 additions and 2 deletions
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() {