From dde00c0f8e4571b6253a8c65598e1de7d905e742 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Fri, 13 Mar 2026 23:47:20 +0000
Subject: fix: resolve MapLibre 11.x migration issues and layout/resource
 errors

---
 .../build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml  | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 android-app/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

(limited to 'android-app/app/build/intermediates/incremental/mergeDebugJniLibFolders')

diff --git a/android-app/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/android-app/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..08aa4d7
--- /dev/null
+++ b/android-app/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/workspace/nav/android-app/app/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
-- 
cgit v1.2.3