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

VNDK snapshot modules must have vndk subdirectory 

VNDK snapshot modules must have vndk subdirectory for their
LOCAL_MODULE_PATH regardless of BOARD_VNDK_VERSION definition.
The snapshot target output file must be not changed.

Bug: 71782197
Test: Build marlin with snapshot in the source and boot
Change-Id: I2b6ec9a5c20d6a5014f690d4eb8e6cd7b3b2f2fa
This commit is contained in:
Justin Yun 2018-01-10 18:28:48 +09:00
parent 74c3f5c9d1
commit 3e15b96234
1 changed files with 4 additions and 6 deletions
Show Stats 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)
} }
} }