From 212ff42ae073d73dcf2ee08c1b72c9ba77d09abb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 10 Jul 2019 12:21:18 +0200
Subject: [PATCH] (Gradle/Android Studio) Update (Default threaded video
 setting) Remove g_defaults.settings.threaded_video - could help Switch and
 Android

---
 config.def.h                     | 2 +-
 configuration.c                  | 3 +--
 defaults.h                       | 1 -
 frontend/drivers/platform_unix.c | 6 ------
 pkg/android/phoenix/build.gradle | 2 +-
 retroarch.c                      | 2 --
 6 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/config.def.h b/config.def.h
index 9c8caab2aa..84b0c02b5d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -192,7 +192,7 @@
 /* Threaded video. Will possibly increase performance significantly
  * at the cost of worse synchronization and latency.
  */
-#if defined(HAVE_LIBNX)
+#if defined(HAVE_LIBNX) || defined(ANDROID)
 #define DEFAULT_VIDEO_THREADED true
 #else
 #define DEFAULT_VIDEO_THREADED false
diff --git a/configuration.c b/configuration.c
index 0d9b2875bd..7ca14b5fee 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2037,8 +2037,7 @@ void config_set_defaults(void)
 #endif
    settings->floats.video_scale                = DEFAULT_SCALE;
 
-   if (g_defaults.settings.video_threaded_enable != DEFAULT_VIDEO_THREADED)
-      video_driver_set_threaded(g_defaults.settings.video_threaded_enable);
+   video_driver_set_threaded(DEFAULT_VIDEO_THREADED);
 
    settings->floats.video_msg_color_r          = ((message_color >> 16) & 0xff) / 255.0f;
    settings->floats.video_msg_color_g          = ((message_color >>  8) & 0xff) / 255.0f;
diff --git a/defaults.h b/defaults.h
index b7f55962bf..a24fa5df0a 100644
--- a/defaults.h
+++ b/defaults.h
@@ -102,7 +102,6 @@ struct defaults
    {
       int out_latency;
       float video_refresh_rate;
-      bool video_threaded_enable;
       char menu[32];
    } settings;
 
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index a56ae1d58e..5c5d35272e 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -1664,15 +1664,9 @@ static void frontend_unix_get_env(int *argc,
    frontend_android_get_name(device_model, sizeof(device_model));
    system_property_get("getprop", "ro.product.id", device_id);
 
-   g_defaults.settings.video_threaded_enable = true;
-
    /* Set automatic default values per device */
    if (device_is_xperia_play(device_model))
-   {
       g_defaults.settings.out_latency = 128;
-      g_defaults.settings.video_refresh_rate = 59.19132938771038;
-      g_defaults.settings.video_threaded_enable = false;
-   }
    else if (strstr(device_model, "GAMEMID_BT"))
       g_defaults.settings.out_latency = 160;
    else if (strstr(device_model, "SHIELD"))
diff --git a/pkg/android/phoenix/build.gradle b/pkg/android/phoenix/build.gradle
index 8e1c1aebe1..ca3db1b582 100644
--- a/pkg/android/phoenix/build.gradle
+++ b/pkg/android/phoenix/build.gradle
@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:3.4.1"
+    classpath 'com.android.tools.build:gradle:3.4.2'
   }
 }
 
diff --git a/retroarch.c b/retroarch.c
index 730d8e95d3..9ea20dc9b7 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -16572,9 +16572,7 @@ static void do_runahead(int runahead_count, bool use_secondary)
    uint64_t frame_count    = video_driver_frame_count;
 
    if (runahead_count <= 0 || !runahead_available)
-   {
       goto force_input_dirty;
-   }
 
    if (!runahead_save_state_size_known)
    {