From 3e15b96234e1cd41592dcb0ad842b5f564e68c39 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 10 Jan 2018 18:28:48 +0900 Subject: [PATCH] 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 --- cc/vndk_prebuilt.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go index b4fcb57aa..99e35f345 100644 --- a/cc/vndk_prebuilt.go +++ b/cc/vndk_prebuilt.go @@ -111,12 +111,10 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext, func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) { if p.shared() { - if ctx.Device() && ctx.useVndk() { - if ctx.isVndkSp() { - p.baseInstaller.subDir = "vndk-sp-" + p.version() - } else if ctx.isVndk() { - p.baseInstaller.subDir = "vndk-" + p.version() - } + if ctx.isVndkSp() { + p.baseInstaller.subDir = "vndk-sp-" + p.version() + } else if ctx.isVndk() { + p.baseInstaller.subDir = "vndk-" + p.version() } p.baseInstaller.install(ctx, file) }