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

Change-Id: I5c499092b6bffcbbc65bf4ca549446107b982f07
2020-02-12 01:03:09 +00:00 · 2020-02-12 01:03:09 +00:00 · 17fa9d67a6
parent fca58067a3 00f3bf9e7e
commit 17fa9d67a6
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
 }