diff --git a/cc/androidmk.go b/cc/androidmk.go
index aa5c4dc..8b1b349 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -17,6 +17,7 @@
 import (
 	"fmt"
 	"io"
+	"path/filepath"
 	"strings"
 
 	"android/soong/common"
@@ -105,5 +106,17 @@
 }
 
 func (test *testLinker) AndroidMk(ret *common.AndroidMkData) {
-	ret.Disabled = true
+	test.binaryLinker.AndroidMk(ret)
+	if Bool(test.Properties.Test_per_src) {
+		ret.SubName = test.binaryLinker.Properties.Stem
+	}
+}
+
+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))
+		return nil
+	})
 }
diff --git a/cc/cc.go b/cc/cc.go
index d20a197..251d1cd 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1195,7 +1195,7 @@
 	dir64 string
 	data  bool
 
-	path common.Path
+	path common.OutputPath
 }
 
 var _ installer = (*baseInstaller)(nil)