Merge changes If6d512ff,I3171f921

* changes:
  Add convenience phony targets for system modules
  Don't panic in turbine with no classes

cmd/merge_zips/merge_zips.go

@@ -78,7 +78,7 @@ func main() {
 	// parse args
 	flag.Parse()
 	args := flag.Args()
-	if len(args) < 2 {
+	if len(args) < 1 {
 		flag.Usage()
 		os.Exit(1)
 	}

java/java.go

@@ -689,15 +689,11 @@ func (j *Module) compileJavaHeader(ctx android.ModuleContext, srcFiles android.P
 	var headerJar android.Path
 	jars = append(jars, deps.staticHeaderJars...)
 
-	if len(jars) == 0 {
-		panic("The turbine.jar is empty without any sources and static libs.")
-	} else {
-		// we cannot skip the combine step for now if there is only one jar
-		// since we have to strip META-INF/TRANSITIVE dir from turbine.jar
-		combinedJar := android.PathForModuleOut(ctx, "turbine-combined", jarName)
-		TransformJarsToJar(ctx, combinedJar, "for turbine", jars, android.OptionalPath{}, false, []string{"META-INF"})
-		headerJar = combinedJar
-	}
+	// we cannot skip the combine step for now if there is only one jar
+	// since we have to strip META-INF/TRANSITIVE dir from turbine.jar
+	combinedJar := android.PathForModuleOut(ctx, "turbine-combined", jarName)
+	TransformJarsToJar(ctx, combinedJar, "for turbine", jars, android.OptionalPath{}, false, []string{"META-INF"})
+	headerJar = combinedJar
 
 	if j.properties.Jarjar_rules != nil {
 		jarjar_rules := android.PathForModuleSrc(ctx, *j.properties.Jarjar_rules)

java/system_modules.go

@@ -138,6 +138,7 @@ func (system *SystemModules) AndroidMk() android.AndroidMkData {
 				fmt.Fprintln(w)
 				fmt.Fprintln(w, makevar, ":=", system.outputFile.String())
 				fmt.Fprintln(w, ".KATI_READONLY", ":=", makevar)
+				fmt.Fprintln(w, name+":", "$("+makevar+")")
 			}
 		},
 	}