summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-12-23 17:44:57 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-12-23 21:10:35 +0100
commit3f47635b86ac34a0dc42d93e77bb1a3ca26f6f79 (patch)
tree3b151e58fee59bdb8de4ad8019698a2889e3b7ed /android
parent03552256018e90edfd825b0d4c0a5d855abaef24 (diff)
Improve native-code generator for (not only) Android.
Group logic from include/osl/detail/component-mapping.h has been duplicated here for now. The plan is to reuse this for iOS too if possible. We don't need component-declarations.h now, which is good because the list of implementation constructors is going to grow a lot over time. Also, something needs to be done to avoid component-defines.h. --constructor parameter was removed because it was not used and also does not make sense. __attribute__ ((visibility("default"))) is removed too. Change-Id: I5e3f988800303d31e1d78220cbd25339bcbc482a
Diffstat (limited to 'android')
-rw-r--r--android/experimental/DocumentLoader/Makefile2
-rw-r--r--android/experimental/LibreOffice4Android/Makefile2
-rw-r--r--android/experimental/desktop/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 5295c8086bcd..092292d5f266 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< \
- -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \
+ -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
-s protocolhandler -s sb \
> $@
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 92f0668b906e..4eadb651b971 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -13,7 +13,7 @@ BOOTSTRAPDIR=../../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
- $< -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \
+ $< -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
-s dlgprov -s protocolhandler -s scriptframe -s sb -s stringresource -s vbaswobj -s vbaevents \
> $@
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 610bf874e1f8..a6618258f6ba 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j \
- -f EXTENDED_CORE -f BASE_CORE -f CALC_CORE -f DRAW_CORE -f MATH -f WRITER \
+ -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
-s basprov -s dlgprov -s cui -s protocolhandler -s scriptframe -s sb -s spl -s stringresource -s uui -s vbaswobj -s vbaevents \
> $@