6 files changed, 18 insertions, 8 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub
index 3d645de38f..fab8458b26 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -59,7 +59,7 @@ for x in env.android_dependencies:
 gradle_java_dirs_text=""
 
 for x in env.android_java_dirs:
-	gradle_java_dirs_text+=",'"+x+"'"
+	gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'"
 
 
 gradle_res_dirs_text=""
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index d4755f4ed6..0f1cbdc73a 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1129,7 +1129,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 		if (file=="lib/armeabi/libgodot_android.so" && !export_arm) {
 			skip=true;
 		}
-		
+
 		if (file.begins_with("META-INF") && _signed) {
 			skip=true;
 		}
@@ -1493,6 +1493,16 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
 		OS::get_singleton()->delay_usec(3000000);
 	}
 
+	if (EditorSettings::get_singleton()->get("android/shutdown_adb_on_exit")) {
+		String adb=EditorSettings::get_singleton()->get("android/adb");
+		if (!FileAccess::exists(adb)) {
+			return; //adb not configured
+		}
+
+		List<String> args;
+		args.push_back("kill-server");
+		OS::get_singleton()->execute(adb,args,true);
+	};
 }
 
 Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp
index 7a038cca64..334d32de0c 100644
--- a/platform/android/file_access_android.cpp
+++ b/platform/android/file_access_android.cpp
@@ -122,7 +122,7 @@ uint8_t FileAccessAndroid::get_8() const {
 	}
 
 
-	uint8_t byte;	
+	uint8_t byte;
 	AAsset_read(a,&byte,1);
 	pos++;
 	return byte;
diff --git a/platform/android/file_access_jandroid.cpp b/platform/android/file_access_jandroid.cpp
index b1b758edb1..da8ceaff14 100644
--- a/platform/android/file_access_jandroid.cpp
+++ b/platform/android/file_access_jandroid.cpp
@@ -203,7 +203,7 @@ void FileAccessJAndroid::setup(  jobject p_io) {
 	__android_log_print(ANDROID_LOG_INFO,"godot","STEP6");
 	cls=(jclass)env->NewGlobalRef(c);
 
-	_file_open = env->GetMethodID(cls, "file_open", "(Ljava/lang/String;Z)I");	
+	_file_open = env->GetMethodID(cls, "file_open", "(Ljava/lang/String;Z)I");
 	if(_file_open != 0) {
 		__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _file_open ok!!");
 	}
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 1751334c9b..2ef28333be 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -304,7 +304,7 @@ void OS_Android::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen)
 
 void OS_Android::set_keep_screen_on(bool p_enabled) {
 	OS::set_keep_screen_on(p_enabled);
-	
+
 	if (set_keep_screen_on_func) {
 		set_keep_screen_on_func(p_enabled);
 	}
@@ -796,7 +796,7 @@ OS_Android::OS_Android(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, OpenURIFu
 	get_model_func=p_get_model_func;
 	get_unique_id_func=p_get_unique_id;
 	get_system_dir_func=p_get_sdir_func;
-    
+
 	video_play_func = p_video_play_func;
 	video_is_playing_func = p_video_is_playing_func;
 	video_pause_func = p_video_pause_func;
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index 5075e766bc..ec1f4119b4 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -193,9 +193,9 @@ public:
 	virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0);
 	virtual VideoMode get_video_mode(int p_screen=0) const;
 	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const;
-	
+
 	virtual void set_keep_screen_on(bool p_enabled);
-	
+
 	virtual Size2 get_window_size() const;
 
 	virtual String get_name();