Merge pull request #2165 from practicalswift/gardening-20160413

[gardening] Remove unused code. Fix file header formatting. Fix PEP 8 regression. Fix recently introduced typo: "accomodate" → "accommodate".

Author: practicalswift

CMakeLists.txt

@@ -458,7 +458,6 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     is_sdk_requested(ANDROID swift_build_android)
     if(swift_build_android AND ${swift_can_crosscompile_stdlib})
       configure_sdk_unix(ANDROID "Android" "android" "android" "armv7" "armv7-none-linux-androideabi")
-      set(SWIFT_SDK_ANDROID_PATH "${SWIFT_ANDROID_SDK_PATH}")
 
       set(SWIFT_PRIMARY_VARIANT_SDK_default "ANDROID")
       set(SWIFT_PRIMARY_VARIANT_ARCH_default "armv7")

include/swift/Remote/CMemoryReader.h

@@ -1,4 +1,4 @@
-//===- CMemoryReader.h - MemoryReader wrapper for C impls -------*- C++ -*-===//
+//===--- CMemoryReader.h - MemoryReader wrapper for C impls -----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/Remote/InProcessMemoryReader.h

@@ -1,4 +1,4 @@
-//===- InProcessMemoryReader.h - Access to local memory ---------*- C++ -*-===//
+//===--- InProcessMemoryReader.h - Access to local memory -------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

include/swift/Remote/MemoryReader.h

@@ -1,4 +1,4 @@
-//===- MemoryReader.h - Abstract access to remote memory --------*- C++ -*-===//
+//===--- MemoryReader.h - Abstract access to remote memory ------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/Driver/ToolChains.h

@@ -54,7 +54,7 @@ class LLVM_LIBRARY_VISIBILITY GenericUnix : public ToolChain {
   virtual std::string getDefaultLinker() const;
 
   /// The target to be passed to the compiler invocation. By default, this
-  /// is the target triple, but this may be overridden to accomodate some
+  /// is the target triple, but this may be overridden to accommodate some
   /// platforms.
   virtual std::string getTargetForLinker() const;
 

utils/build-script

@@ -1144,7 +1144,8 @@ the number of parallel build jobs to use""",
         build_script_impl_args += [
             "--android-ndk", args.android_ndk,
             "--android-ndk-version", args.android_ndk_version,
-            "--android-ndk-toolchain-version", args.android_ndk_toolchain_version, # noqa
+            "--android-ndk-toolchain-version",
+            args.android_ndk_toolchain_version,
             "--android-icu-uc", args.android_icu_uc,
             "--android-icu-uc-include", args.android_icu_uc_include,
             "--android-icu-i18n", args.android_icu_i18n,
@@ -1181,7 +1182,8 @@ the number of parallel build jobs to use""",
         build_script_impl_args += [
             "--android-ndk", args.android_ndk,
             "--android-ndk-version", args.android_ndk_version,
-            "--android-ndk-toolchain-version", args.android_ndk_toolchain_version,
+            "--android-ndk-toolchain-version",
+            args.android_ndk_toolchain_version,
             "--android-icu-uc", args.android_icu_uc,
             "--android-icu-uc-include", args.android_icu_uc_include,
             "--android-icu-i18n", args.android_icu_i18n,