Merge "Use toybox md5sum instead of md5 on macOS." (2b9e20ef) · Commits · e / os / android_build_soong

java/sdk.go

+1 −10

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import (
		"android/soong/java/config"
		"fmt"
		"path/filepath"
		"runtime"
		"sort"
		"strconv"
		"strings"
		@@ -349,15 +348,7 @@ func createAPIFingerprint(ctx android.SingletonContext) {

		cmd.Text("cat").
		Inputs(android.PathsForSource(ctx, in)).
		Text("\|")

		if runtime.GOOS == "darwin" {
		cmd.Text("md5")
		} else {
		cmd.Text("md5sum")
		}

		cmd.Text("\| cut -d' ' -f1 >").
		Text("\| md5sum \| cut -d' ' -f1 >").
		Output(out)
		} else {
		// Unbundled build

+1 −3

Original line number	Diff line number	Diff line
		@@ -129,12 +129,10 @@ var Configuration = map[string]PathConfig{

		func init() {
		if runtime.GOOS == "darwin" {
		// TODO: move Darwin off md5 and onto our md5sum prebuilt.
		Configuration["md5"] = Allowed
		Configuration["sw_vers"] = Allowed
		Configuration["xcrun"] = Allowed

		// We don't have darwin prebuilts for some tools (like toybox),
		// We don't have darwin prebuilts for some tools,
		// so allow the host versions.
		for name, config := range Configuration {
		if config.LinuxOnlyPrebuilt {