From dd718fdb29f1fa98e30af9f7b9af93fc612b4016 Mon Sep 17 00:00:00 2001
From: Hui-Hong You <hiroshi@ghostsinthelab.org>
Date: Wed, 22 May 2024 14:32:31 +0000
Subject: [PATCH] Make libchewing_android_app_module_*.aar be built from source
 code

---
 .../org.ghostsinthelab.apps.guilelessbopomofo.yml     | 11 +++++++++--
 srclibs/libchewingAndroidAppModule.yml                |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 srclibs/libchewingAndroidAppModule.yml

diff --git a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
index 7cba5f9331..520d897bb5 100644
--- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
+++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml
@@ -991,15 +991,22 @@ Builds:
 
   - versionName: 1.9.51
     versionCode: 121
-    disable: https://github.com/hiroshiyui/GuilelessBopomofo/issues/37
     commit: 9ed03844c8dc2b625ace5582de1a3dac945a5090
     subdir: app
-    submodules: true
     sudo:
       - apt-get update
       - apt-get install -y automake g++ libsqlite3-dev libtool make ninja-build cmake
     gradle:
       - yes
+    srclibs:
+      - libchewingAndroidAppModule@0.8.2
+    rm:
+      - app/libs/*.aar
+    build:
+      - pushd $$libchewingAndroidAppModule$$
+      - gradle bundleReleaseAar
+      - popd
+      - cp $$libchewingAndroidAppModule$$/build/outputs/aar/*.aar libs
     ndk: 23.2.8568313
 
 AutoUpdateMode: Version
diff --git a/srclibs/libchewingAndroidAppModule.yml b/srclibs/libchewingAndroidAppModule.yml
new file mode 100644
index 0000000000..fe44870010
--- /dev/null
+++ b/srclibs/libchewingAndroidAppModule.yml
@@ -0,0 +1,5 @@
+RepoType: git
+Repo: https://github.com/hiroshiyui/libchewingAndroidAppModule
+Subdir: app
+
+Prepare: git submodule update --init --recursive