Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a06497ae authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix mac build w/echo -n"

am: 4322f400

Change-Id: I095c9d77b8c010fd665e25ae965ffbac10f752d0
parents 238f6c33 4322f400
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,10 @@ var (

	embeddedPar = pctx.AndroidStaticRule("embeddedPar",
		blueprint.RuleParams{
			// `echo -n` to trim the newline, since the python code just wants the name
			Command: `echo -n '$main' > $entryPoint &&` +
			// `echo -n` to trim the newline, since the python code just wants the name.
			// /bin/sh (used by ninja) on Mac turns off posix mode, and stops supporting -n.
			// Explicitly use bash instead.
			Command: `/bin/bash -c "echo -n '$main' > $entryPoint" &&` +
				`$mergeParCmd -p --prefix $launcher -e $entryPoint $out $srcsZips && ` +
				`chmod +x $out && (rm -f $entryPoint)`,
			CommandDeps: []string{"$mergeParCmd"},