Merge pull request #19401 from hrydgard/ppsspp-legacy-edition

Android: Add new build config "legacyOptimized", which targets an older Android SDK version

UI/DevScreens.cpp

@@ -693,6 +693,9 @@ void SystemInfoScreen::CreateTabs() {
 #ifdef JENKINS
 	buildConfig->Add(new InfoItem(si->T("Built by"), "Jenkins"));
 #endif
+#ifdef ANDROID_LEGACY
+	buildConfig->Add(new InfoItem("ANDROID_LEGACY", ""));
+#endif
 #ifdef _DEBUG
 	buildConfig->Add(new InfoItem("_DEBUG", ""));
 #else

android/build.gradle

@@ -123,6 +123,9 @@ android {
 		vr {
 			manifest.srcFile 'VRManifest.xml'
 		}
+		legacy {
+			res.srcDirs = ['legacy/res']
+		}
 	}
 	productFlavors {
 		normal {
@@ -161,6 +164,25 @@ android {
 				abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
 			}
 		}
+		legacy {
+			applicationId 'org.ppsspp.ppsspplegacy'
+			dimension "variant"
+			targetSdkVersion 29  // This is the point of legacy.
+			externalNativeBuild {
+				cmake {
+					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
+					arguments '-DANDROID=true',
+						'-DANDROID_PLATFORM=android-16',
+						'-DANDROID_TOOLCHAIN=clang',
+						'-DANDROID_CPP_FEATURES=',
+						'-DANDROID_STL=c++_static',
+						'-DANDROID_LEGACY=TRUE'
+				}
+			}
+			ndk {
+				abiFilters 'armeabi-v7a', 'arm64-v8a'
+			}
+		}
 		vr {
 			applicationId 'org.ppsspp.ppssppvr'
 			dimension "variant"
@@ -174,14 +196,17 @@ android {
 							'-DANDROID_CPP_FEATURES=',
 							'-DANDROID_STL=c++_static',
 							'-DANDROID_ARM_NEON=TRUE',
-							'-DOPENXR=TRUE'
+							'-DOPENXR=TRUE',
+							'-DANDROID_LEGACY=TRUE'
 				}
 			}
 			ndk {
 				abiFilters 'arm64-v8a'
 			}
 		}
 	}
+	// TODO: This is deprecated and needs a replacement. See https://stackoverflow.com/questions/67330818/android-gradle-plugin7-0-0-alpha15-removed-variantfilter-property-how-to-rest
+	// Though, not really that important.
 	variantFilter { variant ->
 		def needed = variant.name in [
 			'normalDebug',		// for debugging
@@ -191,6 +216,7 @@ android {
 			'vrDebug',    		// for VR debugging
 			'vrOptimized',		// for VR testing
 			'vrRelease',  		// for VR releases
+			'legacyOptimized',  // for legacy releases
 		]
 		variant.setIgnore(!needed)
 	}

android/legacy/conv_color.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Wirtten by ChatGPT
+
+# Define the base directory to start the search
+BASE_DIR="$1"
+
+# Check if the base directory is provided and exists
+if [ -z "$BASE_DIR" ]; then
+    echo "Usage: $0 /path/to/directory"
+    exit 1
+fi
+
+if [ ! -d "$BASE_DIR" ]; then
+    echo "Directory $BASE_DIR does not exist."
+    exit 1
+fi
+
+# Function to process images
+process_image() {
+    local image_path="$1"
+
+    # Define output path (can be modified to save to a different location)
+    local output_path="$1" # ${image_path%.*}_tinted.${image_path##*.}"
+
+    # Apply the tint and darkening
+    convert "$image_path" \
+        -modulate 80,50,55 \
+        "$output_path"
+
+    echo "Processed $image_path -> $output_path"
+}
+
+export -f process_image
+
+# Find and process image files
+find "$BASE_DIR" -type f \( -iname '*.png' \) -exec bash -c 'process_image "$0"' {} \;
+
+echo "Image processing completed."

android/legacy/icon_color.md

@@ -0,0 +1,3 @@
+# How to create legacy icons from regular icons
+
+convert ic_launcher.png -modulate 80,50,55 ic_launcher.png

android/legacy/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/legacy/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/legacy/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#404040</color>
+</resources>

android/legacy/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">PPSSPP Legacy</string>
+</resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:8.5.2'
     }
 }