diff --git a/app/build.gradle b/app/build.gradle index ddd93c88c..ecbfd6463 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.0' defaultConfig { applicationId "net.kdt.pojavlaunch" minSdkVersion 21 targetSdkVersion 26 - versionCode 156231 - versionName "2.4.2_preview11_6393b_20200411" + versionCode 156232 + versionName "2.4.2_preview11b1_6394b_20200413" } buildTypes { @@ -33,10 +33,10 @@ dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'commons-codec:commons-codec:1.14' implementation 'com.wu-man:android-bsf-api:3.1.3' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'com.android.support:support-v4:26.0.0' + implementation 'com.android.support:appcompat-v7:26.0.0' + implementation 'com.android.support:design:26.0.0' + implementation 'com.android.support:support-annotations:26.0.0' // compile 'com.google.guava:guava:24.0-android' implementation fileTree(dir: 'libs', include: ['*.jar']) diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index a28db29c9..dd96824ba 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -389,7 +389,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, } }); - System.loadLibrary("gl04es"); + System.loadLibrary("Regal"); Bitmap awtGraphics = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888); AndroidGraphics2D.getInstance(this, new Canvas(awtGraphics), null); @@ -950,7 +950,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, System.out.println(Cipher.getInstance("RSA")); System.out.println(Cipher.getInstance("RSA/ECB/PKCS1Padding")); */ - if (true) { // android.os.Build.VERSION.SDK_INT >= 23) { // Marshmallow + if (android.os.Build.VERSION.SDK_INT >= 23) { // Marshmallow // FUUUUU I DON'T KNOW FIXME Cipher rsaPkcs1Cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); // Cipher.getInstance("RSA", rsaPkcs1Cipher.getProvider()); diff --git a/app/src/main/jniLibs/armeabi-v7a/libRegal.so b/app/src/main/jniLibs/armeabi-v7a/libRegal.so new file mode 100644 index 000000000..3bf5ab33d Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/libRegal.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libgl04es.so b/app/src/main/jniLibs/armeabi-v7a/libgl04es.so deleted file mode 100644 index 55afa94d0..000000000 Binary files a/app/src/main/jniLibs/armeabi-v7a/libgl04es.so and /dev/null differ diff --git a/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so b/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so index 74df428e9..34daa5a5a 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so and b/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so differ diff --git a/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so.boardwalk b/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so.boardwalk new file mode 100644 index 000000000..74df428e9 Binary files /dev/null and b/app/src/main/jniLibs/armeabi-v7a/liblwjgl.so.boardwalk differ diff --git a/app/src/main/jniLibs/x86/libRegal.so b/app/src/main/jniLibs/x86/libRegal.so new file mode 100644 index 000000000..d4b423d4e Binary files /dev/null and b/app/src/main/jniLibs/x86/libRegal.so differ diff --git a/app/src/main/jniLibs/x86/libgl04es.so b/app/src/main/jniLibs/x86/libgl04es.so deleted file mode 100644 index 1141f95f7..000000000 Binary files a/app/src/main/jniLibs/x86/libgl04es.so and /dev/null differ