diff --git a/cc/androidmk.go b/cc/androidmk.go
index 8b1b349..af8347a 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -115,8 +115,10 @@
 func (installer *baseInstaller) AndroidMk(ret *common.AndroidMkData) {
 	ret.Extra = append(ret.Extra, func(w io.Writer, outputFile common.Path) error {
 		path := installer.path.RelPathString()
-		fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Dir(path))
-		fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+filepath.Base(path))
+		dir, file := filepath.Split(path)
+		stem := strings.TrimSuffix(file, filepath.Ext(file))
+		fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+dir)
+		fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)
 		return nil
 	})
 }
diff --git a/cc/cc.go b/cc/cc.go
index 251d1cd..ec26f74 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2174,10 +2174,12 @@
 				if linker.buildStatic() && linker.buildShared() {
 					modules = mctx.CreateLocalVariations("static", "shared")
 					modules[0].(*Module).linker.(baseLinkerInterface).setStatic(true)
+					modules[0].(*Module).installer = nil
 					modules[1].(*Module).linker.(baseLinkerInterface).setStatic(false)
 				} else if linker.buildStatic() {
 					modules = mctx.CreateLocalVariations("static")
 					modules[0].(*Module).linker.(baseLinkerInterface).setStatic(true)
+					modules[0].(*Module).installer = nil
 				} else if linker.buildShared() {
 					modules = mctx.CreateLocalVariations("shared")
 					modules[0].(*Module).linker.(baseLinkerInterface).setStatic(false)