Merge "Make mk2rbc accept either a makefile or product" am: 00364b6114

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842579

Change-Id: I4b3439e87f90be880da0e883b5a9f02707e04934

mk2rbc/cmd/mk2rbc.go

@@ -154,47 +154,49 @@ func main() {
 	}
 
 	// Convert!
-	ok := true
+	files := flag.Args()
-	if *launcher != "" {
+	productConfigMap := buildProductConfigMap()
-		if len(flag.Args()) != 1 {
+	if *allInSource {
-			quit(fmt.Errorf("a launcher can be generated only for a single product"))
+		for _, path := range productConfigMap {
+			files = append(files, path)
 		}
-		product := flag.Args()[0]
+	}
-		productConfigMap := buildProductConfigMap()
+	for i, file := range files {
-		path, found := productConfigMap[product]
+		if _, err := os.Stat(file); os.IsNotExist(err) {
-		if !found {
+			temp, ok := productConfigMap[file]
-			quit(fmt.Errorf("cannot generate configuration launcher for %s, it is not a known product",
+			if ok {
-				product))
+				files[i] = temp
+			} else {
+				quit(fmt.Errorf("%s is neither a product makefile nor a product name", file))
+			}
+		}
+	}
+	ok := true
+	for _, mkFile := range files {
+		ok = convertOne(mkFile) && ok
+	}
+
+	if *launcher != "" {
+		if len(files) != 1 {
+			quit(fmt.Errorf("a launcher can be generated only for a single product"))
 		}
 		versionDefaults, err := generateVersionDefaults()
 		if err != nil {
 			quit(err)
 		}
-		ok = convertOne(path) && ok
 		versionDefaultsPath := outputFilePath(versionDefaultsMk)
 		err = writeGenerated(versionDefaultsPath, versionDefaults)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "%s:%s", path, err)
+			fmt.Fprintf(os.Stderr, "%s:%s", files[0], err)
 			ok = false
 		}
 
-		err = writeGenerated(*launcher, mk2rbc.Launcher(outputFilePath(path), versionDefaultsPath,
+		err = writeGenerated(*launcher, mk2rbc.Launcher(outputFilePath(files[0]), versionDefaultsPath,
-			mk2rbc.MakePath2ModuleName(path)))
+			mk2rbc.MakePath2ModuleName(files[0])))
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "%s:%s", path, err)
+			fmt.Fprintf(os.Stderr, "%s:%s", files[0], err)
 			ok = false
 		}
-	} else {
-		files := flag.Args()
-		if *allInSource {
-			productConfigMap := buildProductConfigMap()
-			for _, path := range productConfigMap {
-				files = append(files, path)
-			}
-		}
-		for _, mkFile := range files {
-			ok = convertOne(mkFile) && ok
-		}
 	}
 
 	printStats()