Small refactoring of the Android "desktop app" code, no functional change

Move the native methods out to a separate AppSupport class so that they aren't
in our "experimenal" Desktop app's namespace. Don't hardcode the name of that
class in the native code, but have the app register the class to which the
damage callbacks should be done.

Possibly the AppSupport and Bootstrap classes should be combined. Later.

Also, the "android" part of the package name is superfluous; it is
Android-specific code, no information gained by having an "android" part in
the package name.

Change-Id: Iddf55c8034ead7693887ace8438deb002c5eea9f

1 files changed, 4 insertions, 4 deletions

diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index ca80bdfd7b4f..3b86d464bb60 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -151,11 +151,11 @@ lo_get_libmap(void)
     // Guard against possible function-level link-time pruning of
     // "unused" code. We need to pull these in, too, as they aren't in
     // any of the libs we link with -Wl,--whole-archive. Is this necessary?
-    extern void Java_org_libreoffice_experimental_desktop_Desktop_runMain();
-    volatile void *p = (void *) Java_org_libreoffice_experimental_desktop_Desktop_runMain;
+    extern void Java_org_libreoffice_android_AppSupport_runMain();
+    volatile void *p = (void *) Java_org_libreoffice_android_AppSupport_runMain;
 
-    extern void Java_org_libreoffice_experimental_desktop_Desktop_renderVCL();
-    p = (void *) Java_org_libreoffice_experimental_desktop_Desktop_renderVCL;
+    extern void Java_org_libreoffice_android_AppSupport_renderVCL();
+    p = (void *) Java_org_libreoffice_android_AppSupport_renderVCL;
 
     return map;
 }