diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-13 19:33:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-21 22:54:36 +0200 |
| commit | 52a8744afee2cd589813f0377d93f821fce7aedd (patch) | |
| tree | 1c68647d4a31559e77e8b8be98e15bb9af18f76a /desktop | |
| parent | f68cd77923ed996c372e6814d615c6faf635626a (diff) | |
Revert "Clean up remains of NativeActivity-based Android app support"
This reverts commit cecc926070ee3d2ad6296fc5e0cfcde8642bb140.
Conflicts:
sal/android/lo-bootstrap.c
sal/inc/osl/detail/android-bootstrap.h
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 2a635b5953c9..4687b5d05f41 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -94,4 +94,13 @@ ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Library_use_libraries,sofficeapp,tubes)) endif +# +# We need the lo_main symbol for our boostrap loader +# +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_cobjects,sofficeapp,\ + desktop/source/app/main \ +)) +endif + # vim: set ts=4 sw=4 et: |