commit 3ba41fdc57cf558d367ba900b8128c64da860e80
author Shinichiro Hamaji <hamaji@google.com> Thu Mar 17 06:30:20 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Thu Mar 17 06:30:31 2016 +0900
tree e5d0c2f0bdb5c230a3a1db31362e60208cd09ccb
parent 158867849c8a55d1db95ead7cbeca4aacd47350f
parent f124de09482eb53fa7a652cb8fe217c01aea46f4

Merge remote-tracking branch 'aosp/upstream'

There was a regression in the previous merge.

f124de0 Put a whitespace for subshell before a close paren
ce7a2b4 Add a whitespace after an open paren for subshell

Change-Id: Id14d00bc0549e37a8c0e0b8990753b4f74f3a538

ninja.cc

diff --git a/ninja.cc b/ninja.cc
index c95ee64..6ba2ec8 100644
--- a/ninja.cc
+++ b/ninja.cc
@@ -454,7 +454,7 @@
       }
 
       if (needs_subshell)
-        *cmd_buf += ')';
+        *cmd_buf += " )";
     }
     return (was_gomacc_found || g_flags.remote_num_jobs ||
             g_flags.goma_dir) && !use_gomacc;

testcase/subshell_in_recipe.mk

diff --git a/testcase/subshell_in_recipe.mk b/testcase/subshell_in_recipe.mk
new file mode 100644
index 0000000..7578fe7
--- /dev/null
+++ b/testcase/subshell_in_recipe.mk
@@ -0,0 +1,3 @@
+test:
+	true
+	(echo PASS)