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" am: d40471c7c8

Browse Source 
am: b94713329c

Change-Id: I501e21f65d44c74e8ad2a7a98dd7c1797e7aa2d1
This commit is contained in:
Justin Yun
2018-01-19 07:59:31 +00:00
committed by android-build-merger
parent beaef2407d b94713329c
commit 67d9f21eca
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/vndk_prebuilt.go
View File

@@ -111,13 +111,11 @@ 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)
} }
} }