Revert "Revert "Gradle""

This reverts commit e8cf66f0a9.

.gitignore

@@ -115,6 +115,10 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/android/phoenix/bin/
 /pkg/android/phoenix/gen/
 /pkg/android/phoenix/local.properties
+/pkg/android/phoenix/gradle.properties
+/pkg/android/phoenix/.gradle
+/pkg/android/phoenix/.externalNativeBuild
+/pkg/android/phoenix/build
 
 # Cloned by libretro-fetch.sh
 /media/assets/

deps/dr/dr_flac.h

@@ -667,7 +667,7 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr
         #define DRFLAC_NO_CPUID
         #endif
     #else
-        #if defined(__GNUC__) || defined(__clang__)
+        #if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__)
             static void drflac__cpuid(int info[4], int fid)
             {
                 __asm__ __volatile__ (

pkg/android/phoenix-common/jni/Android.mk

@@ -100,7 +100,7 @@ LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder
 # Let ndk-build set the optimization flags but remove -O3 like in cf3c3
 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS))
 
-LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl 
+LOCAL_LDLIBS	:= -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
 LOCAL_C_INCLUDES := \
 							$(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \
 							$(LOCAL_PATH)/$(RARCH_DIR)/deps \

pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java

@@ -49,14 +49,16 @@ public class RetroActivityCommon extends RetroActivityLocation
     long[] pattern = {16};
     int[] strengths = {strength};
 
-    if (id == -1)
-      vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
-    else
-    {
-      InputDevice dev = InputDevice.getDevice(id);
+    if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+      if (id == -1)
+        vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
+      else
+      {
+        InputDevice dev = InputDevice.getDevice(id);
 
-      if (dev != null)
-        vibrator = dev.getVibrator();
+        if (dev != null)
+          vibrator = dev.getVibrator();
+      }
     }
 
     if (vibrator == null)
@@ -72,7 +74,7 @@ public class RetroActivityCommon extends RetroActivityLocation
     else
       pattern[0] = 1000;
 
-    if (Build.VERSION.SDK_INT >= 26) {
+    if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
       if (id >= 0)
         Log.i("RetroActivity", "Vibrate id " + id + ": strength " + strength);
 

pkg/android/phoenix-gradle/.gitignore

@@ -1,135 +0,0 @@
-
-# Created by https://www.gitignore.io/api/androidstudio
-# Edit at https://www.gitignore.io/?templates=androidstudio
-
-### AndroidStudio ###
-# Covers files to be ignored for android development using Android Studio.
-
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle
-.gradle/
-build/
-
-# Signing files
-.signing/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio
-/*/build/
-/*/local.properties
-/*/out
-/*/*/build
-/*/*/production
-captures/
-.navigation/
-*.ipr
-*~
-*.swp
-
-# Android Patch
-gen-external-apklibs
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# NDK
-obj/
-
-# IntelliJ IDEA
-*.iml
-*.iws
-/out/
-
-# User-specific configurations
-.idea/caches/
-.idea/libraries/
-.idea/shelf/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/assetWizardSettings.xml
-
-# OS-specific files
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Legacy Eclipse project files
-.classpath
-.project
-.cproject
-.settings/
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.ear
-
-# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
-hs_err_pid*
-
-## Plugin-specific files:
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Mongo Explorer plugin
-.idea/mongoSettings.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### AndroidStudio Patch ###
-
-!/gradle/wrapper/gradle-wrapper.jar
-
-# End of https://www.gitignore.io/api/androidstudio

pkg/android/phoenix-gradle/app/build.gradle

@@ -1,68 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
-
-    defaultConfig {
-        applicationId "com.retroarch"
-        minSdkVersion 16
-        targetSdkVersion 28
-
-        ndk {
-            moduleName "retroarch-activity"
-        }
-
-        externalNativeBuild {
-            ndkBuild {
-                arguments "-j${Runtime.runtime.availableProcessors()}"
-            }
-        }
-    }
-
-    flavorDimensions "abi"
-    productFlavors {
-        ra32 {
-            dimension "abi"
-            ndk {
-                abiFilters 'armeabi-v7a', 'x86'
-            }
-            resValue "string", "app_name", "RetroArch"
-        }
-        ra64 {
-            dimension "abi"
-            ndk {
-                abiFilters 'arm64-v8a', 'x86_64'
-            }
-            applicationIdSuffix '.aarch64'
-            resValue "string", "app_name", "RetroArch (AArch64)"
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-    externalNativeBuild {
-        ndkBuild {
-            path file('../../phoenix/jni/Android.mk')
-        }
-    }
-
-    sourceSets {
-        ra32 {
-            java.srcDirs = ['../../phoenix/src']
-            res.srcDirs = ['../../phoenix/res', '../../phoenix/libs/googleplay/res']
-        }
-        ra64 {
-            java.srcDirs = ['../../phoenix/src']
-            res.srcDirs = ['../../phoenix64/res', '../../phoenix64/libs/googleplay/res']
-        }
-    }
-}
-
-dependencies {
-    implementation files('../../phoenix/libs/googleplay/libs/google-play-services.jar')
-}

pkg/android/phoenix-gradle/app/src/main/AndroidManifest.xml

@@ -1,43 +0,0 @@
-<!-- <!DOCTYPE manifest [ <!ENTITY % versionDTD SYSTEM "../../../version.dtd"> %versionDTD; ]> !-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.retroarch"
-    android:versionCode="77"
-    android:versionName="1.7.7"
-    android:installLocation="internalOnly">
-    <uses-feature android:glEsVersion="0x00020000" />
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:hasCode="true"
-        android:isGame="true"
-        android:banner="@drawable/banner"
-        tools:ignore="GoogleAppIndexingWarning">
-        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
-        <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-                <category android:name="tv.ouya.intent.category.GAME" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.retroarch.browser.retroactivity.RetroActivityFuture" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
-            <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
-            <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
-        </activity>
-        <activity android:name="com.retroarch.browser.retroactivity.RetroActivityPast" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
-            <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
-            <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
-        </activity>
-        <activity android:name="com.retroarch.browser.debug.CoreSideloadActivity" android:exported="true"/>
-    </application>
-</manifest>

pkg/android/phoenix-gradle/build.gradle

@@ -1,17 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}

pkg/android/phoenix-gradle/settings.gradle

@@ -1 +0,0 @@
-include ':app'

pkg/android/phoenix-legacy/.gitignore

@@ -0,0 +1,5 @@
+/gen
+/bin
+/libs/*/*.so
+/obj
+/jni/modules/*.so

pkg/android/phoenix-legacy/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <!-- <!DOCTYPE manifest [ <!ENTITY % versionDTD SYSTEM "../../../version.dtd"> %versionDTD; ]> !-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.retroarch.aarch64"
-    android:versionCode="78"
+    package="com.retroarch.legacy"
+    android:versionCode="1556806339"
     android:versionName="1.7.7"
     android:installLocation="internalOnly">
     <uses-feature android:glEsVersion="0x00020000" />
@@ -10,7 +10,7 @@
     <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="26" />
+        android:targetSdkVersion="16" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET" />
@@ -19,7 +19,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="RetroArch (AArch64)"
+        android:label="RetroArch"
         android:hasCode="true"
         android:isGame="true"
         android:banner="@drawable/banner">
@@ -32,10 +32,6 @@
                 <category android:name="tv.ouya.intent.category.GAME" />
             </intent-filter>
         </activity>
-        <activity android:name="com.retroarch.browser.retroactivity.RetroActivityFuture" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
-            <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
-            <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
-        </activity>
         <activity android:name="com.retroarch.browser.retroactivity.RetroActivityPast" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
             <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
             <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />