Backed out changeset 25964226853a (bug 1607204) for causing bug 1610471 which crashes the reviewbot a=backout CLOSED TREE

python/mozbuild/mozbuild/compilation/database.py

@@ -7,7 +7,6 @@
 from __future__ import absolute_import, print_function
 
 import os
-from shlex import split as shell_split
 import types
 
 from mozbuild.backend.common import CommonBackend
@@ -103,7 +102,13 @@ class CompileDBBackend(CommonBackend):
             variables.update(self._local_flags[directory])
             c = []
             for a in cmd:
-                c.extend(shell_split(expand_variables(a, variables)))
+                a = expand_variables(a, variables).split()
+                if not a:
+                    continue
+                if isinstance(a, types.StringTypes):
+                    c.append(a)
+                else:
+                    c.extend(a)
             per_source_flags = self._per_source_flags.get(filename)
             if per_source_flags is not None:
                 c.extend(per_source_flags)