style: Fix PEP8 whitespace issues in Python files

Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.

2 files changed, 152 insertions, 152 deletions

diff --git a/platform/android/SCsub b/platform/android/SCsub
index 9db6636f8b..146f7c25a3 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -22,7 +22,7 @@ android_files = [
     'java_class_wrapper.cpp'
 ]
 
-#env.Depends('#core/math/vector3.h', 'vector3_psp.h')
+# env.Depends('#core/math/vector3.h', 'vector3_psp.h')
 
 #obj = env.SharedObject('godot_android.cpp')
 
@@ -30,86 +30,86 @@ env_android = env.Clone()
 if env['target'] == "profile":
     env_android.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
 
-android_objects=[]
+android_objects = []
 for x in android_files:
-    android_objects.append( env_android.SharedObject( x ) )
+    android_objects.append(env_android.SharedObject(x))
 
 prog = None
 
-abspath=env.Dir(".").abspath
+abspath = env.Dir(".").abspath
 
 
-gradle_basein = open(abspath+"/build.gradle.template","rb")
-gradle_baseout = open(abspath+"/java/build.gradle","wb")
+gradle_basein = open(abspath + "/build.gradle.template", "rb")
+gradle_baseout = open(abspath + "/java/build.gradle", "wb")
 
 gradle_text = gradle_basein.read()
 
 
-gradle_maven_repos_text=""
+gradle_maven_repos_text = ""
 
 if len(env.android_maven_repos) > 0:
-    gradle_maven_repos_text+="maven {\n"
+    gradle_maven_repos_text += "maven {\n"
     for x in env.android_maven_repos:
-        gradle_maven_repos_text+="\t\t"+x+"\n"
-    gradle_maven_repos_text+="\t}\n"
+        gradle_maven_repos_text += "\t\t" + x + "\n"
+    gradle_maven_repos_text += "\t}\n"
 
-gradle_maven_dependencies_text=""
+gradle_maven_dependencies_text = ""
 
 for x in env.android_dependencies:
-    gradle_maven_dependencies_text+=x+"\n"
+    gradle_maven_dependencies_text += x + "\n"
 
-gradle_java_dirs_text=""
+gradle_java_dirs_text = ""
 
 for x in env.android_java_dirs:
-    gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_java_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
 
-gradle_res_dirs_text=""
+gradle_res_dirs_text = ""
 
 for x in env.android_res_dirs:
-    gradle_res_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_res_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_aidl_dirs_text=""
+gradle_aidl_dirs_text = ""
 
 for x in env.android_aidl_dirs:
-    gradle_aidl_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_aidl_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_jni_dirs_text=""
+gradle_jni_dirs_text = ""
 
 for x in env.android_jni_dirs:
-    gradle_jni_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_jni_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_asset_dirs_text=""
+gradle_asset_dirs_text = ""
 
-gradle_default_config_text=""
+gradle_default_config_text = ""
 
 for x in env.android_default_config:
-    gradle_default_config_text+=x+"\n\t\t"
+    gradle_default_config_text += x + "\n\t\t"
 
-gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text)
-gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text)
-gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$",gradle_res_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$",gradle_default_config_text)
+gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$", gradle_maven_repos_text)
+gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$", gradle_maven_dependencies_text)
+gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$", gradle_java_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$", gradle_res_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$", gradle_asset_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$", gradle_aidl_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$", gradle_jni_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$", gradle_default_config_text)
 
 
-gradle_baseout.write( gradle_text )
+gradle_baseout.write(gradle_text)
 gradle_baseout.close()
 
 
-pp_basein = open(abspath+"/AndroidManifest.xml.template","rb")
-pp_baseout = open(abspath+"/java/AndroidManifest.xml","wb")
+pp_basein = open(abspath + "/AndroidManifest.xml.template", "rb")
+pp_baseout = open(abspath + "/java/AndroidManifest.xml", "wb")
 manifest = pp_basein.read()
-manifest = manifest.replace("$$ADD_APPLICATION_CHUNKS$$",env.android_manifest_chunk)
-manifest = manifest.replace("$$ADD_PERMISSION_CHUNKS$$",env.android_permission_chunk)
-manifest = manifest.replace("$$ADD_APPATTRIBUTE_CHUNKS$$",env.android_appattributes_chunk)
-pp_baseout.write( manifest )
+manifest = manifest.replace("$$ADD_APPLICATION_CHUNKS$$", env.android_manifest_chunk)
+manifest = manifest.replace("$$ADD_PERMISSION_CHUNKS$$", env.android_permission_chunk)
+manifest = manifest.replace("$$ADD_APPATTRIBUTE_CHUNKS$$", env.android_appattributes_chunk)
+pp_baseout.write(manifest)
 
 
-env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"])
+env_android.SharedLibrary("#bin/libgodot", [android_objects], SHLIBSUFFIX=env["SHLIBSUFFIX"])
 
 
 lib_arch_dir = ''
@@ -125,8 +125,8 @@ else:
 if lib_arch_dir != '':
     if env['target'] == 'release':
         lib_type_dir = 'release'
-    else: # release_debug, debug
+    else:  # release_debug, debug
         lib_type_dir = 'debug'
 
-    out_dir = '#platform/android/java/libs/'+lib_type_dir+'/'+lib_arch_dir
-    env_android.Command(out_dir+'/libgodot_android.so', '#bin/libgodot'+env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
+    out_dir = '#platform/android/java/libs/' + lib_type_dir + '/' + lib_arch_dir
+    env_android.Command(out_dir + '/libgodot_android.so', '#bin/libgodot' + env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 9a14452862..f1331d24d5 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -21,12 +21,12 @@ def get_opts():
 
     return [
         ('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
-        ('NDK_TARGET', 'toolchain to use for the NDK',os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
-        ('NDK_TARGET_X86', 'toolchain to use for the NDK x86',os.environ.get("NDK_TARGET_X86", "x86-4.9")),
-        ('ndk_platform', 'compile for platform: (android-<api> , example: android-14)',"android-14"),
-        ('android_arch', 'select compiler architecture: (armv7/armv6/x86)',"armv7"),
-        ('android_neon','enable neon (armv7 only)',"yes"),
-        ('android_stl','enable STL support in android port (for modules)',"no")
+        ('NDK_TARGET', 'toolchain to use for the NDK', os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
+        ('NDK_TARGET_X86', 'toolchain to use for the NDK x86', os.environ.get("NDK_TARGET_X86", "x86-4.9")),
+        ('ndk_platform', 'compile for platform: (android-<api> , example: android-14)', "android-14"),
+        ('android_arch', 'select compiler architecture: (armv7/armv6/x86)', "armv7"),
+        ('android_neon', 'enable neon (armv7 only)', "yes"),
+        ('android_stl', 'enable STL support in android port (for modules)', "no")
     ]
 
 
@@ -34,7 +34,7 @@ def get_flags():
 
     return [
         ('tools', 'no'),
-        ('openssl', 'builtin'), #use builtin openssl
+        ('openssl', 'builtin'),  # use builtin openssl
     ]
 
 
@@ -52,16 +52,16 @@ def configure(env):
     # Workaround for MinGW. See:
     # http://www.scons.org/wiki/LongCmdLinesOnWin32
     import os
-    if (os.name=="nt"):
+    if (os.name == "nt"):
 
         import subprocess
 
-        def mySubProcess(cmdline,env):
-            #print "SPAWNED : " + cmdline
+        def mySubProcess(cmdline, env):
+            # print "SPAWNED : " + cmdline
             startupinfo = subprocess.STARTUPINFO()
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
             proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env)
+                                    stderr=subprocess.PIPE, startupinfo=startupinfo, shell=False, env=env)
             data, err = proc.communicate()
             rv = proc.wait()
             if rv:
@@ -75,176 +75,176 @@ def configure(env):
             newargs = ' '.join(args[1:])
             cmdline = cmd + " " + newargs
 
-            rv=0
-            if len(cmdline) > 32000 and cmd.endswith("ar") :
+            rv = 0
+            if len(cmdline) > 32000 and cmd.endswith("ar"):
                 cmdline = cmd + " " + args[1] + " " + args[2] + " "
-                for i in range(3,len(args)) :
-                    rv = mySubProcess( cmdline + args[i], env )
-                    if rv :
+                for i in range(3, len(args)):
+                    rv = mySubProcess(cmdline + args[i], env)
+                    if rv:
                         break
             else:
-                rv = mySubProcess( cmdline, env )
+                rv = mySubProcess(cmdline, env)
 
             return rv
 
         env['SPAWN'] = mySpawn
 
-    ndk_platform=env['ndk_platform']
+    ndk_platform = env['ndk_platform']
 
-    if env['android_arch'] not in ['armv7','armv6','x86']:
-        env['android_arch']='armv7'
+    if env['android_arch'] not in ['armv7', 'armv6', 'x86']:
+        env['android_arch'] = 'armv7'
 
-    if env['android_arch']=='x86':
-        env['NDK_TARGET']=env['NDK_TARGET_X86']
-        env["x86_libtheora_opt_gcc"]=True
+    if env['android_arch'] == 'x86':
+        env['NDK_TARGET'] = env['NDK_TARGET_X86']
+        env["x86_libtheora_opt_gcc"] = True
 
     if env['PLATFORM'] == 'win32':
         env.Tool('gcc')
         env['SHLIBSUFFIX'] = '.so'
 
 
-    neon_text=""
-    if env["android_arch"]=="armv7" and env['android_neon']=='yes':
-        neon_text=" (with neon)"
-    print("Godot Android!!!!! ("+env['android_arch']+")"+neon_text)
+    neon_text = ""
+    if env["android_arch"] == "armv7" and env['android_neon'] == 'yes':
+        neon_text = " (with neon)"
+    print("Godot Android!!!!! (" + env['android_arch'] + ")" + neon_text)
 
     env.Append(CPPPATH=['#platform/android'])
 
-    if env['android_arch']=='x86':
-        env.extra_suffix=".x86"+env.extra_suffix
-    elif env['android_arch']=='armv6':
-        env.extra_suffix=".armv6"+env.extra_suffix
-    elif env["android_arch"]=="armv7":
-        if env['android_neon']=='yes':
-            env.extra_suffix=".armv7.neon"+env.extra_suffix
+    if env['android_arch'] == 'x86':
+        env.extra_suffix = ".x86" + env.extra_suffix
+    elif env['android_arch'] == 'armv6':
+        env.extra_suffix = ".armv6" + env.extra_suffix
+    elif env["android_arch"] == "armv7":
+        if env['android_neon'] == 'yes':
+            env.extra_suffix = ".armv7.neon" + env.extra_suffix
         else:
-            env.extra_suffix=".armv7"+env.extra_suffix
+            env.extra_suffix = ".armv7" + env.extra_suffix
 
-    gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
+    gcc_path = env["ANDROID_NDK_ROOT"] + "/toolchains/" + env["NDK_TARGET"] + "/prebuilt/";
 
     if (sys.platform.startswith("linux")):
         if (platform.machine().endswith('64')):
-            gcc_path=gcc_path+"/linux-x86_64/bin"
+            gcc_path = gcc_path + "/linux-x86_64/bin"
         else:
-            gcc_path=gcc_path+"/linux-x86/bin"
+            gcc_path = gcc_path + "/linux-x86/bin"
     elif (sys.platform.startswith("darwin")):
-        gcc_path=gcc_path+"/darwin-x86_64/bin"
+        gcc_path = gcc_path + "/darwin-x86_64/bin"
         env['SHLINKFLAGS'][1] = '-shared'
         env['SHLIBSUFFIX'] = '.so'
     elif (sys.platform.startswith('win')):
         if (platform.machine().endswith('64')):
-            gcc_path=gcc_path+"/windows-x86_64/bin"
+            gcc_path = gcc_path + "/windows-x86_64/bin"
         else:
-            gcc_path=gcc_path+"/windows-x86/bin"
-
-    env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH']
-    if env['android_arch']=='x86':
-        env['CC'] = gcc_path+'/i686-linux-android-gcc'
-        env['CXX'] = gcc_path+'/i686-linux-android-g++'
-        env['AR'] = gcc_path+"/i686-linux-android-ar"
-        env['RANLIB'] = gcc_path+"/i686-linux-android-ranlib"
-        env['AS'] = gcc_path+"/i686-linux-android-as"
+            gcc_path = gcc_path + "/windows-x86/bin"
+
+    env['ENV']['PATH'] = gcc_path + ":" + env['ENV']['PATH']
+    if env['android_arch'] == 'x86':
+        env['CC'] = gcc_path + '/i686-linux-android-gcc'
+        env['CXX'] = gcc_path + '/i686-linux-android-g++'
+        env['AR'] = gcc_path + "/i686-linux-android-ar"
+        env['RANLIB'] = gcc_path + "/i686-linux-android-ranlib"
+        env['AS'] = gcc_path + "/i686-linux-android-as"
     else:
-        env['CC'] = gcc_path+'/arm-linux-androideabi-gcc'
-        env['CXX'] = gcc_path+'/arm-linux-androideabi-g++'
-        env['AR'] = gcc_path+"/arm-linux-androideabi-ar"
-        env['RANLIB'] = gcc_path+"/arm-linux-androideabi-ranlib"
-        env['AS'] = gcc_path+"/arm-linux-androideabi-as"
+        env['CC'] = gcc_path + '/arm-linux-androideabi-gcc'
+        env['CXX'] = gcc_path + '/arm-linux-androideabi-g++'
+        env['AR'] = gcc_path + "/arm-linux-androideabi-ar"
+        env['RANLIB'] = gcc_path + "/arm-linux-androideabi-ranlib"
+        env['AS'] = gcc_path + "/arm-linux-androideabi-as"
 
-    if env['android_arch']=='x86':
+    if env['android_arch'] == 'x86':
         env['ARCH'] = 'arch-x86'
     else:
         env['ARCH'] = 'arch-arm'
 
     import string
-    #include path
-    gcc_include=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH'] +"/usr/include"
-    ld_sysroot=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']
-    #glue_include=env["ANDROID_NDK_ROOT"]+"/sources/android/native_app_glue"
-    ld_path=env["ANDROID_NDK_ROOT"]+"/platforms/"+ndk_platform+"/"+env['ARCH']+"/usr/lib"
+    # include path
+    gcc_include = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH'] + "/usr/include"
+    ld_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH']
+    # glue_include=env["ANDROID_NDK_ROOT"]+"/sources/android/native_app_glue"
+    ld_path = env["ANDROID_NDK_ROOT"] + "/platforms/" + ndk_platform + "/" + env['ARCH'] + "/usr/lib"
     env.Append(CPPPATH=[gcc_include])
 #	env['CCFLAGS'] = string.split('-DNO_THREADS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi -march=armv5te -mtune=xscale -msoft-float  -fno-exceptions -mthumb -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED ')
 
-    env['neon_enabled']=False
-    if env['android_arch']=='x86':
+    env['neon_enabled'] = False
+    if env['android_arch'] == 'x86':
         env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__  -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-    elif env["android_arch"]=="armv6":
+    elif env["android_arch"] == "armv6":
         env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__  -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-    elif env["android_arch"]=="armv7":
+    elif env["android_arch"] == "armv7":
         env.Append(CCFLAGS=string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__  -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED'))
-        if env['android_neon']=='yes':
-            env['neon_enabled']=True
-            env.Append(CCFLAGS=['-mfpu=neon','-D__ARM_NEON__'])
+        if env['android_neon'] == 'yes':
+            env['neon_enabled'] = True
+            env.Append(CCFLAGS=['-mfpu=neon', '-D__ARM_NEON__'])
         else:
             env.Append(CCFLAGS=['-mfpu=vfpv3-d16'])
 
     env.Append(LDPATH=[ld_path])
     env.Append(LIBS=['OpenSLES'])
 #	env.Append(LIBS=['c','m','stdc++','log','EGL','GLESv1_CM','GLESv2','OpenSLES','supc++','android'])
-    env.Append(LIBS=['EGL','OpenSLES','android'])
-    env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2', 'z'])
+    env.Append(LIBS=['EGL', 'OpenSLES', 'android'])
+    env.Append(LIBS=['c', 'm', 'stdc++', 'log', 'GLESv1_CM', 'GLESv2', 'z'])
 
-    env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
+    env["LINKFLAGS"] = string.split(" -g --sysroot=" + ld_sysroot + " -Wl,--no-undefined -Wl,-z,noexecstack ")
     env.Append(LINKFLAGS=["-Wl,-soname,libgodot_android.so"])
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        env.Append(CCFLAGS=['-O2', '-ffast-math','-fomit-frame-pointer'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer'])
 
-    elif (env["target"]=="release_debug"):
+    elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['-O2', '-ffast-math','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
         env.Append(CCFLAGS=['-D_DEBUG', '-g1', '-Wall', '-O0', '-DDEBUG_ENABLED'])
         env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
 
-    env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT'])
+    env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL', '-DMPC_FIXED_POINT'])
 #	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
 
     # TODO: Move that to opus module's config
     if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
-        if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"):
+        if (env["android_arch"] == "armv6" or env["android_arch"] == "armv7"):
             env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
-        env.opus_fixed_point="yes"
-
-    if (env['android_stl']=='yes'):
-        #env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"])
-        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
-        if env['android_arch']=='x86':
-            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"])
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
-        elif env['android_arch']=='armv6':
-            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"])
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
-        elif env["android_arch"]=="armv7":
-            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include"])
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
-
-        env.Append(LIBS=["gnustl_static","supc++"])
-        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
-
-        #env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/stlport/stlport"])
-        #env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"])
-        #env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libstdc++.a"])
+        env.opus_fixed_point = "yes"
+
+    if (env['android_stl'] == 'yes'):
+        # env.Append(CCFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/system/include"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/include"])
+        if env['android_arch'] == 'x86':
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
+        elif env['android_arch'] == 'armv6':
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
+        elif env["android_arch"] == "armv7":
+            env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include"])
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
+
+        env.Append(LIBS=["gnustl_static", "supc++"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cpufeatures"])
+
+        # env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/stlport/stlport"])
+        # env.Append(CCFLAGS=["-I"+env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"])
+        # env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libstdc++.a"])
     else:
 
-        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/include"])
-        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cpufeatures"])
-        if env['android_arch']=='x86':
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
-        elif env["android_arch"]=="armv6":
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
-        elif env["android_arch"]=="armv7":
-            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"]+"/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/include"])
+        env.Append(CPPPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cpufeatures"])
+        if env['android_arch'] == 'x86':
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"])
+        elif env["android_arch"] == "armv6":
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"])
+        elif env["android_arch"] == "armv7":
+            env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a"])
         env.Append(LIBS=['gnustl_static'])
-        env.Append(CCFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST'])
+        env.Append(CCFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST'])
 
 
     import methods
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
 
     env.use_windows_spawn_fix()