|
@@ -248,6 +248,7 @@ static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/instal
|
|
|
static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
|
|
|
static const int DEFAULT_TARGET_SDK_VERSION = 32; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
|
|
|
|
|
|
+#ifndef ANDROID_ENABLED
|
|
|
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
|
|
|
EditorExportPlatformAndroid *ea = static_cast<EditorExportPlatformAndroid *>(ud);
|
|
|
|
|
@@ -277,7 +278,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-#ifndef ANDROID_ENABLED
|
|
|
// Check for devices updates
|
|
|
String adb = get_adb_path();
|
|
|
if (FileAccess::exists(adb)) {
|
|
@@ -389,7 +389,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
|
|
|
ea->devices_changed.set();
|
|
|
}
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
uint64_t sleep = 200;
|
|
|
uint64_t wait = 3000000;
|
|
@@ -402,7 +401,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-#ifndef ANDROID_ENABLED
|
|
|
if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
|
|
|
String adb = get_adb_path();
|
|
|
if (!FileAccess::exists(adb)) {
|
|
@@ -413,8 +411,8 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
|
|
|
args.push_back("kill-server");
|
|
|
OS::get_singleton()->execute(adb, args);
|
|
|
}
|
|
|
-#endif
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
String EditorExportPlatformAndroid::get_project_name(const String &p_name) const {
|
|
|
String aname;
|
|
@@ -3138,10 +3136,14 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
|
|
|
|
|
|
devices_changed.set();
|
|
|
plugins_changed.set();
|
|
|
+#ifndef ANDROID_ENABLED
|
|
|
check_for_changes_thread.start(_check_for_changes_poll_thread, this);
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
|
|
|
+#ifndef ANDROID_ENABLED
|
|
|
quit_request.set();
|
|
|
check_for_changes_thread.wait_to_finish();
|
|
|
+#endif
|
|
|
}
|