commit 142d4fd01dae3bec548c58a6acc78b815e689e5e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 09 00:08:23 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 09 00:08:23 2016 +0000
tree 44aaa85db54d5b1fd9fb5191373702eb84bec4e0
parent cdd4c24ff78525339b2193dee5b9c3e3f5c88a69
parent 62496a0d2eabf72d6f8b3b99a5e87559c9bfd85d

Merge "Use nil pointers for arch property structs"

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index c19aa17..283fe27 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -206,6 +206,8 @@
 	ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
 		path, file := filepath.Split(c.installPath)
 		stem := strings.TrimSuffix(file, filepath.Ext(file))
+		fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
+		fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext())
 		fmt.Fprintln(w, "LOCAL_MODULE_PATH := "+path)
 		fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)