commit d40471c7c82e27e7586a6a67885e7842f1657a40
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 19 07:14:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 07:14:27 2018 +0000
tree 0243b249340ca9a16e999a01cc107b0b8fb870d5
parent b0712e80141fd99a0b543a9b5c08d5773c12b9ad
parent 3e15b96234e1cd41592dcb0ad842b5f564e68c39

Merge "VNDK snapshot modules must have vndk subdirectory"

cc/vndk_prebuilt.go

diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go
index b4fcb57..99e35f3 100644
--- a/cc/vndk_prebuilt.go
+++ b/cc/vndk_prebuilt.go
@@ -111,12 +111,10 @@
 
 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)
 	}