commit 86db8821bb325a10f054eff738badb6e97f08695
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 25 12:28:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 25 12:28:27 2022 +0000
tree 77d2403044d1c439708a2f5012070580d8f9f2f6
parent 3ef0581cdaad5fbb2b64343c1963a5250741abe5
parent 79c3b77ea2e8c875eb9a9e93053b5d351922561e

Merge "raw_binary output should not be executable."

filesystem/raw_binary.go

diff --git a/filesystem/raw_binary.go b/filesystem/raw_binary.go
index f726124..1544ea7 100644
--- a/filesystem/raw_binary.go
+++ b/filesystem/raw_binary.go
@@ -26,7 +26,8 @@
 var (
 	toRawBinary = pctx.AndroidStaticRule("toRawBinary",
 		blueprint.RuleParams{
-			Command:     "${objcopy} --output-target=binary ${in} ${out}",
+			Command: "${objcopy} --output-target=binary ${in} ${out} &&" +
+				"chmod -x ${out}",
 			CommandDeps: []string{"$objcopy"},
 		},
 		"objcopy")
@@ -76,7 +77,7 @@
 
 	ctx.Build(pctx, android.BuildParams{
 		Rule:        toRawBinary,
-		Description: "prefix symbols " + outputFile.Base(),
+		Description: "raw binary " + outputFile.Base(),
 		Output:      outputFile,
 		Input:       inputFile,
 		Args: map[string]string{
@@ -93,7 +94,7 @@
 
 // Implements android.AndroidMkEntriesProvider
 func (r *rawBinary) AndroidMkEntries() []android.AndroidMkEntries {
-	return []android.AndroidMkEntries{android.AndroidMkEntries{
+	return []android.AndroidMkEntries{{
 		Class:      "ETC",
 		OutputFile: android.OptionalPathForPath(r.output),
 	}}