From 72ec20f82431b34f4c1ba438b32379be4edd6838 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 10 Aug 2025 22:03:25 +0200 Subject: [PATCH 1/4] feat: 16k page sizes (#211) see https://developer.android.com/guide/practices/page-sizes Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/211 Co-authored-by: septs Co-committed-by: septs --- libs/lpac-jni/src/main/jni/Application.mk | 3 ++- libs/lpac-jni/src/main/jni/lpac-jni.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/lpac-jni/src/main/jni/Application.mk b/libs/lpac-jni/src/main/jni/Application.mk index 2112196..c1d3766 100644 --- a/libs/lpac-jni/src/main/jni/Application.mk +++ b/libs/lpac-jni/src/main/jni/Application.mk @@ -1,4 +1,5 @@ APP_ABI := all APP_SHORT_COMMANDS := true APP_CFLAGS := -Wno-compound-token-split-by-macro -APP_LDFLAGS := -Wl,--build-id=none -z muldefs \ No newline at end of file +APP_LDFLAGS := -Wl,--build-id=none -z muldefs +APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true diff --git a/libs/lpac-jni/src/main/jni/lpac-jni.mk b/libs/lpac-jni/src/main/jni/lpac-jni.mk index c0bcee7..dad173c 100644 --- a/libs/lpac-jni/src/main/jni/lpac-jni.mk +++ b/libs/lpac-jni/src/main/jni/lpac-jni.mk @@ -1,4 +1,5 @@ LOCAL_PATH := $(call my-dir) +LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384" # function to find all *.c files under a directory define all-c-files-under From deb0a372b14caacdf5d3e509135efb9b19c95f10 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 10 Aug 2025 22:07:10 +0200 Subject: [PATCH 2/4] feat: allow copy app version and source code url (#216) Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/216 Co-authored-by: septs Co-committed-by: septs --- app-common/src/main/res/xml/pref_settings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-common/src/main/res/xml/pref_settings.xml b/app-common/src/main/res/xml/pref_settings.xml index 690a120..17505e1 100644 --- a/app-common/src/main/res/xml/pref_settings.xml +++ b/app-common/src/main/res/xml/pref_settings.xml @@ -96,12 +96,14 @@ Date: Sun, 10 Aug 2025 22:07:25 +0200 Subject: [PATCH 3/4] fix: aid list (#217) Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/217 Co-authored-by: septs Co-committed-by: septs --- .../src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt index 5f4aec4..464aeee 100644 --- a/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt +++ b/app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt @@ -50,9 +50,12 @@ internal object PreferenceConstants { # eUICC standard $EUICC_DEFAULT_ISDR_AID - # eSTK.me + # ESTKme AUX (deprecated, use SE0 instead) A06573746B6D65FFFFFFFF4953442D52 + # ESTKme SE0 + A06573746B6D65FFFF4953442D522030 + # eSIM.me A0000005591010000000008900000300 From a8b7482afb98236c591912dc24524da7543bbf59 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 10 Aug 2025 22:08:31 +0200 Subject: [PATCH 4/4] feat: version name suffix (#215) see https://developer.android.com/build/build-variants Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/215 Co-authored-by: septs Co-committed-by: septs --- app-unpriv/build.gradle.kts | 3 +++ app/build.gradle.kts | 3 +++ .../src/main/kotlin/im/angry/openeuicc/build/Versioning.kt | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app-unpriv/build.gradle.kts b/app-unpriv/build.gradle.kts index 66a60b4..d59fe71 100644 --- a/app-unpriv/build.gradle.kts +++ b/app-unpriv/build.gradle.kts @@ -27,6 +27,9 @@ android { } buildTypes { + defaultConfig { + versionNameSuffix = "-unpriv" + } release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b9c2100..69e0db5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,6 +23,9 @@ android { } buildTypes { + defaultConfig { + versionNameSuffix = "-priv" + } release { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt index 24f0235..ef07c43 100644 --- a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt +++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt @@ -16,7 +16,7 @@ val Project.gitVersionCode: Int standardOutput = stdout } stdout.toString("utf-8").trim('\n').toInt() - } catch (e: Exception) { + } catch (_: Exception) { 0 } @@ -29,7 +29,7 @@ val Project.gitVersionName: String standardOutput = stdout } stdout.toString("utf-8").trim('\n') - } catch (e: Exception) { + } catch (_: Exception) { "Unknown" } @@ -38,7 +38,7 @@ class MyVersioningPlugin: Plugin { target.configure { defaultConfig { versionCode = target.gitVersionCode - versionName = target.gitVersionName + versionName = target.gitVersionName.removePrefix("unpriv-") } applicationVariants.all {