Merge "m <module_name> builds <module_name>.<apex_name>" am: 45f3c9b6a6

Change-Id: I30659368e9eb37d83e2f1ad45b43f3bd3c2d50f7
2020-02-12 00:48:42 +00:00 · 2020-02-12 00:48:42 +00:00 · 00f3bf9e7e
parent b19df54d94 45f3c9b6a6
commit 00f3bf9e7e
1 changed files with 6 additions and 0 deletions
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@ -217,6 +217,12 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
 			}
 			fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
 		}
+
+		// m <module_name> will build <module_name>.<apex_name> as well.
+		if fi.moduleName != moduleName && a.primaryApexType {
+			fmt.Fprintln(w, ".PHONY: "+fi.moduleName)
+			fmt.Fprintln(w, fi.moduleName+": "+moduleName)
+		}
 	}
 	return moduleNames
 }