From 95fa701ac0225ebab138a5121b9fe2168c354acb Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Sat, 25 Aug 2018 17:16:56 -0400 Subject: [PATCH] Android: Restore processor count, Cleanup --- .travis.yml | 2 +- .../src/main/java/com/reicast/emulator/emu/GL2JNIView.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ec8f848c..a5e258611 100755 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_script: script: - git fetch --depth 50 - cd shell/android-studio -- export NUMBER_OF_PROCESSORS=4 +- export NUMBER_OF_PROCESSORS=2 - sudo chmod 755 travis-build.sh - "./travis-build.sh" - test -z "$encrypted_c726d225a9d9_key" || ./travis-release.sh diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java index f700a8cde..4c75e13df 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java @@ -65,13 +65,9 @@ public class GL2JNIView extends GLSurfaceView public static final int LAYER_TYPE_HARDWARE = 2; private static String fileName; - //private AudioThread audioThread; private EmuThread ethd; private Handler handler = new Handler(); - private static int sWidth; - private static int sHeight; - Vibrator vib; private boolean editVjoyMode = false;