From efdfcb73600d727a609d2ab350d22b64efbad729 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 9 Jan 2026 11:04:15 +0530
Subject: [PATCH 1/4] Build debug apk in ci

---
 .gitlab-ci.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b8541c4f..5991ec52b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,9 @@
+image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest
+
 stages:
   - auto-merge-main
   - update-from-upstream
+  - build
 
 include:
   - project: 'e/templates'
@@ -15,3 +18,21 @@ main:
   variables:
     UPSTREAM_BRANCH: lineage-23.2
     LOCAL_BRANCH: main
+
+before_script:
+  - export GRADLE_USER_HOME="$CI_PROJECT_DIR/.gradle"
+  - chmod +x ./gradlew
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+    - .gradle/
+
+build:
+  stage: build
+  script:
+    - ./gradlew assembleDebug
+  artifacts:
+    when: always
+    paths:
+      - build/outputs/apk/debug
-- 
GitLab


From 62896d9999ae28b60be720197d6c918636ff5397 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 9 Jan 2026 11:23:24 +0530
Subject: [PATCH 2/4] Use current sdk_version

---
 common/Android.bp | 2 +-
 java/Android.bp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Android.bp b/common/Android.bp
index f3f7a0e3c..e2979b583 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -26,5 +26,5 @@ java_library {
     host_supported: true,
     srcs: ["src/**/*.java"],
     static_libs: ["jsr305"],
-    sdk_version: "34",
+    sdk_version: "current",
 }
diff --git a/java/Android.bp b/java/Android.bp
index 895ac1cfa..324129261 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -58,7 +58,7 @@ android_app {
 
     min_sdk_version: "30",
     target_sdk_version: "34",
-    sdk_version: "35",
+    sdk_version: "current",
 
     product_specific: true,
 
-- 
GitLab


From 4626fbd1e52d96c7285c53ec32db7112ebe55be2 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 9 Jan 2026 13:34:35 +0530
Subject: [PATCH 3/4] Use SDK int 35 instead of VANILLA_ICE_CREAM

- Required in order to build for a13
---
 java/src/com/android/inputmethod/latin/utils/ResourceUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
index 62810dcb6..6763d6939 100644
--- a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
@@ -188,7 +188,7 @@ public final class ResourceUtils {
     }
 
     public static int getDefaultKeyboardWidth(final Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+        if (Build.VERSION.SDK_INT >= 35) { // Build.VERSION_CODES.VANILLA_ICE_CREAM
             // Since Android 15’s edge-to-edge enforcement, window insets should be considered.
             final WindowManager wm = context.getSystemService(WindowManager.class);
             final WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
-- 
GitLab


From b30ec189ead4fbdce2632fa2e5b189b325248225 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Mon, 12 Jan 2026 13:15:01 +0530
Subject: [PATCH 4/4] Update automerge for main

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5991ec52b..07b721858 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,13 @@ include:
     ref: master
     file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
 
-main:
+auto_merge_main:
+  extends: .auto-merge-main
+  variables:
+    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/
+    TARGET_BRANCH: main
+
+upstream_main:
   extends: .update-from-upstream
   variables:
     UPSTREAM_BRANCH: lineage-23.2
-- 
GitLab