lgtm ================ Comment at: lib/Driver/Tools.cpp:5768 @@ -5765,1 +5767,3 @@ + const bool isAndroid = + ToolChain.getTriple().getEnvironment() == llvm::Triple::Android; ---------------- Nit: you've got the same line broken in a different way in the first chunk above. http://llvm-reviews.chandlerc.com/D91