diff --git a/cc/library.go b/cc/library.go
index f7194e4..b5512bb 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -587,6 +587,26 @@
 
 func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
 	if !ctx.static() {
+		if ctx.Device() {
+			if ctx.isNdk() {
+				library.baseInstaller.subDir = "ndk"
+				if ctx.Proprietary() {
+					ctx.ModuleErrorf("NDK library must not be proprietary")
+				}
+			} else if ctx.isVndk() {
+				library.baseInstaller.subDir = "vndk"
+				if ctx.Proprietary() {
+					ctx.ModuleErrorf("VNDK library must not be proprietary")
+				}
+			} else if ctx.isSameProcessHal() {
+				library.baseInstaller.subDir = "sameprocess"
+				if !ctx.Proprietary() {
+					ctx.ModuleErrorf("SameProcess HAL library must be proprietary")
+				}
+			} else {
+				// Do nothing for other types of lib
+			}
+		}
 		library.baseInstaller.install(ctx, file)
 	}
 }