mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Miscellaneous fixes for Play Feature Delivery

Browse Source
This commit is contained in:
Braden Farmer 2020-08-31 13:57:58 -06:00
parent 6b756986d5
commit cf043f083b
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ public class RetroActivityCommon extends NativeActivity
* @return the list of available cores * @return the list of available cores
*/ */
public String[] getAvailableCores() { public String[] getAvailableCores() {
int id = getResources().getIdentifier("module_names_" + sanitizeCoreName(Build.CPU_ABI), "array", getPackageName()); int id = getResources().getIdentifier("module_names_" + Build.CPU_ABI.replace('-', '_'), "array", getPackageName());
String[] returnVal = getResources().getStringArray(id); String[] returnVal = getResources().getStringArray(id);
Log.i("RetroActivity", "getAvailableCores: " + Arrays.toString(returnVal)); Log.i("RetroActivity", "getAvailableCores: " + Arrays.toString(returnVal));
@ -512,7 +512,7 @@ public class RetroActivityCommon extends NativeActivity
* @return The sanitized core name. * @return The sanitized core name.
*/ */
private String sanitizeCoreName(String coreName) { private String sanitizeCoreName(String coreName) {
return coreName.replace('-', '_'); return "core_" + coreName.replace('-', '_');
} }
/** /**
@ -522,11 +522,11 @@ public class RetroActivityCommon extends NativeActivity
* @return The unsanitized core name. * @return The unsanitized core name.
*/ */
private String unsanitizeCoreName(String coreName) { private String unsanitizeCoreName(String coreName) {
if(coreName.equals("mesen_s")) { if(coreName.equals("core_mesen_s")) {
return "mesen-s"; return "mesen-s";
} }
return coreName; return coreName.substring(5);
} }
/** /**

4
pkg/android/phoenix/build.gradle
View File

@ -68,12 +68,16 @@ android {
} }
} }
playStoreNormal { playStoreNormal {
minSdkVersion 21
resValue "string", "app_name", "RetroArch" resValue "string", "app_name", "RetroArch"
buildConfigField "boolean", "PLAY_STORE_BUILD", "true" buildConfigField "boolean", "PLAY_STORE_BUILD", "true"
dimension "variant" dimension "variant"
} }
playStoreAarch64 { playStoreAarch64 {
minSdkVersion 21
applicationIdSuffix '.aarch64' applicationIdSuffix '.aarch64'
resValue "string", "app_name", "RetroArch (AArch64)" resValue "string", "app_name", "RetroArch (AArch64)"
buildConfigField "boolean", "PLAY_STORE_BUILD", "true" buildConfigField "boolean", "PLAY_STORE_BUILD", "true"

4
pkg/android/phoenix/init_modules.sh
View File

@ -47,7 +47,7 @@ done
# Time to generate a module for each core! # Time to generate a module for each core!
while IFS= read -r core; do while IFS= read -r core; do
SANITIZED_CORE_NAME=$(echo $core | sed "s/-/_/g") SANITIZED_CORE_NAME="core_$(echo $core | sed "s/-/_/g")"
DISPLAY_NAME=$(cat $INFO_PATH/${core}_libretro.info | grep "display_name" | cut -d'"' -f 2) DISPLAY_NAME=$(cat $INFO_PATH/${core}_libretro.info | grep "display_name" | cut -d'"' -f 2)
echo "Generating module for $core..." echo "Generating module for $core..."
@ -83,7 +83,7 @@ while IFS= read -r core; do
done done
# Write metadata about the module into the corresponding files # Write metadata about the module into the corresponding files
echo "<string name=\"core_name_$SANITIZED_CORE_NAME\">$DISPLAY_NAME</string>" >> res/values/core_names.xml echo "<string name=\"$SANITIZED_CORE_NAME\">$DISPLAY_NAME</string>" >> res/values/core_names.xml
echo "':modules:$SANITIZED_CORE_NAME'," >> dynamic_features.gradle echo "':modules:$SANITIZED_CORE_NAME'," >> dynamic_features.gradle
echo "include ':modules:$SANITIZED_CORE_NAME'" >> settings.gradle echo "include ':modules:$SANITIZED_CORE_NAME'" >> settings.gradle
done <<< "$CORES_LIST" done <<< "$CORES_LIST"

4
pkg/android/phoenix/module_template/AndroidManifest.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:dist="http://schemas.android.com/apk/distribution" xmlns:dist="http://schemas.android.com/apk/distribution"
package="com.retroarch.core_modules.%CORE_NAME%"> package="com.retroarch.modules.%CORE_NAME%">
<dist:module dist:title="@string/core_name_%CORE_NAME%"> <dist:module dist:title="@string/%CORE_NAME%">
<dist:delivery> <dist:delivery>
<dist:on-demand /> <dist:on-demand />
</dist:delivery> </dist:delivery>

2
pkg/android/phoenix/module_template/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
} }