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

Merge "VNDK snapshot modules must have vndk subdirectory"

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-19 07:14:27 +00:00
committed by Gerrit Code Review
parent b0712e8014 3e15b96234
commit d40471c7c8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/vndk_prebuilt.go
View File

@@ -111,12 +111,10 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) { func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) {
if p.shared() { if p.shared() {
if ctx.Device() && ctx.useVndk() { if ctx.isVndkSp() {
if ctx.isVndkSp() { p.baseInstaller.subDir = "vndk-sp-" + p.version()
p.baseInstaller.subDir = "vndk-sp-" + p.version() } else if ctx.isVndk() {
} else if ctx.isVndk() { p.baseInstaller.subDir = "vndk-" + p.version()
p.baseInstaller.subDir = "vndk-" + p.version()
}
} }
p.baseInstaller.install(ctx, file) p.baseInstaller.install(ctx, file)
} }