Android: Updating for latest SDL and revised Gradle project

2 files changed, 7 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47f8537..e060736c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ set (SOURCES
     src/ui/scrollwidget.c
     src/ui/scrollwidget.h
     src/ui/sidebarwidget.c
-    src/ui/sidebarwidget.h    
+    src/ui/sidebarwidget.h
     src/ui/text.c
     src/ui/text.h
     src/ui/touch.c
@@ -290,7 +290,7 @@ if (NOT ANDROID)
     add_executable (app ${SOURCES} ${RESOURCES})
 else ()
     # The whole app becomes one shared library, based on this static one.
-    add_library (app STATIC ${SOURCES})
+    add_library (app SHARED ${SOURCES})
 endif ()
 set_property (TARGET app PROPERTY C_STANDARD 11)
 if (TARGET ext-deps)
@@ -398,7 +398,7 @@ if (APPLE)
         XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "fi.skyjake.lagrange"
     )
     if (IOS)
-        target_compile_definitions (app PUBLIC 
+        target_compile_definitions (app PUBLIC
             LAGRANGE_IOS_VERSION="${IOS_BUNDLE_VERSION}"
             LAGRANGE_IOS_BUILD_DATE="${IOS_BUILD_DATE}"
         )
@@ -421,7 +421,7 @@ endif ()
 if (MSYS)
     target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI
     if (ENABLE_WINSPARKLE)
-        target_link_libraries (app PUBLIC winsparkle)        
+        target_link_libraries (app PUBLIC winsparkle)
     endif ()
 endif ()
 if (UNIX)
@@ -452,7 +452,7 @@ elseif (HAIKU)
         LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
     install (FILES ${EMB_BIN} DESTINATION .)
 elseif (ANDROID)
-    file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../app/src/main/assets)
+    file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../src/main/assets)
 elseif (UNIX AND NOT APPLE)
     include (GNUInstallDirs)
     set_target_properties (app PROPERTIES
diff --git a/src/app.c b/src/app.c
index 2135ec7c..28b32939 100644
--- a/src/app.c
+++ b/src/app.c
@@ -118,7 +118,7 @@ struct Impl_App {
     iMimeHooks * mimehooks;
     iGmCerts *   certs;
     iVisited *   visited;
-    iBookmarks * bookmarks;    
+    iBookmarks * bookmarks;
     iMainWindow *window;
     iPtrArray    popupWindows;
     iSortedArray tickers; /* per-frame callbacks, used for animations */
@@ -715,7 +715,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
 #endif
     d->isDarkSystemTheme = iTrue; /* will be updated by system later on, if supported */
     init_CommandLine(&d->args, argc, argv);
-    /* Where was the app started from? We ask SDL first because the command line alone 
+    /* Where was the app started from? We ask SDL first because the command line alone
        cannot be relied on (behavior differs depending on OS). */ {
         char *exec = SDL_GetBasePath();
         if (exec) {