asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #10531 from RandomShaper/remove-old-android-setting

Browse source 
Sanitize Android debug
This commit is contained in:
Rémi Verschelde 2017-08-29 00:09:27 +02:00 committed by GitHub
commit a91d12ab94
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main/main.cpp
View file

@ -69,7 +69,6 @@
#include "core/io/file_access_zip.h" #include "core/io/file_access_zip.h"
#include "core/io/stream_peer_ssl.h" #include "core/io/stream_peer_ssl.h"
#include "core/io/stream_peer_tcp.h" #include "core/io/stream_peer_tcp.h"
#include "core/os/thread.h"
#include "main/input_default.h" #include "main/input_default.h"
#include "performance.h" #include "performance.h"
#include "translation.h" #include "translation.h"
@ -886,7 +885,11 @@ error:
return ERR_INVALID_PARAMETER; return ERR_INVALID_PARAMETER;
} }
Error Main::setup2() { Error Main::setup2(Thread::ID p_main_tid_override) {
if (p_main_tid_override) {
Thread::_main_thread_id = p_main_tid_override;
}
OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx); OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx);
if (init_use_custom_pos) { if (init_use_custom_pos) {

3
main/main.h
View file

@ -34,6 +34,7 @@
@author Juan Linietsky <reduzio@gmail.com> @author Juan Linietsky <reduzio@gmail.com>
*/ */
#include "core/os/thread.h"
#include "error_list.h" #include "error_list.h"
#include "typedefs.h" #include "typedefs.h"
@ -49,7 +50,7 @@ class Main {
public: public:
static Error setup(const char *execpath, int argc, char *argv[], bool p_second_phase = true); static Error setup(const char *execpath, int argc, char *argv[], bool p_second_phase = true);
static Error setup2(); static Error setup2(Thread::ID p_main_tid_override = 0);
static bool start(); static bool start();
static bool iteration(); static bool iteration();
static void cleanup(); static void cleanup();

12
platform/android/export/export.cpp
View file

@ -1073,11 +1073,7 @@ public:
//export_temp //export_temp
ep.step("Exporting APK", 0); ep.step("Exporting APK", 0);
bool use_adb_over_usb = bool(EDITOR_DEF("export/android/use_remote_debug_over_adb", true)); p_debug_flags |= DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST;
if (use_adb_over_usb) {
p_debug_flags |= DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST;
}
String export_to = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport.apk"; String export_to = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport.apk";
Error err = export_project(p_preset, true, export_to, p_debug_flags); Error err = export_project(p_preset, true, export_to, p_debug_flags);
@ -1123,7 +1119,7 @@ public:
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
} }
if (use_adb_over_usb) { if (p_debug_flags & DEBUG_FLAG_REMOTE_DEBUG) {
args.clear(); args.clear();
args.push_back("-s"); args.push_back("-s");
@ -1142,6 +1138,9 @@ public:
OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
print_line("Reverse result: " + itos(rv)); print_line("Reverse result: " + itos(rv));
}
if (p_debug_flags & DEBUG_FLAG_DUMB_CLIENT) {
int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port");
@ -1724,7 +1723,6 @@ void register_android_exporter() {
EDITOR_DEF("export/android/force_system_user", false); EDITOR_DEF("export/android/force_system_user", false);
EDITOR_DEF("export/android/timestamping_authority_url", ""); EDITOR_DEF("export/android/timestamping_authority_url", "");
EDITOR_DEF("export/android/use_remote_debug_over_adb", false);
EDITOR_DEF("export/android/shutdown_adb_on_exit", true); EDITOR_DEF("export/android/shutdown_adb_on_exit", true);
Ref<EditorExportAndroid> exporter = Ref<EditorExportAndroid>(memnew(EditorExportAndroid)); Ref<EditorExportAndroid> exporter = Ref<EditorExportAndroid>(memnew(EditorExportAndroid));

4
platform/android/java_glue.cpp
View file

@ -1002,7 +1002,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job
ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaClassWrapper", java_class_wrapper)); ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaClassWrapper", java_class_wrapper));
_initialize_java_modules(); _initialize_java_modules();
Main::setup2(); // Since Godot is initialized on the UI thread, _main_thread_id was set to that thread's id,
// but for Godot purposes, the main thread is the one running the game loop
Main::setup2(Thread::get_caller_id());
++step; ++step;
suspend_mutex->unlock(); suspend_mutex->unlock();
input_mutex->unlock(); input_mutex->unlock();