diff --git a/android/module.go b/android/module.go
index ef20f8d..216aefe 100644
--- a/android/module.go
+++ b/android/module.go
@@ -567,18 +567,20 @@
 func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name string, srcPath OutputPath) OutputPath {
 	fullInstallPath := installPath.Join(a, name)
 
-	a.ModuleBuild(pctx, ModuleBuildParams{
-		Rule:      Symlink,
-		Output:    fullInstallPath,
-		OrderOnly: Paths{srcPath},
-		Default:   !a.AConfig().EmbeddedInMake(),
-		Args: map[string]string{
-			"fromPath": srcPath.String(),
-		},
-	})
+	if a.Host() || !a.AConfig().SkipDeviceInstall() {
+		a.ModuleBuild(pctx, ModuleBuildParams{
+			Rule:      Symlink,
+			Output:    fullInstallPath,
+			OrderOnly: Paths{srcPath},
+			Default:   !a.AConfig().EmbeddedInMake(),
+			Args: map[string]string{
+				"fromPath": srcPath.String(),
+			},
+		})
 
-	a.installFiles = append(a.installFiles, fullInstallPath)
-	a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
+		a.installFiles = append(a.installFiles, fullInstallPath)
+		a.checkbuildFiles = append(a.checkbuildFiles, srcPath)
+	}
 	return fullInstallPath
 }
 
