summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-20 14:18:22 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-09-20 14:26:31 +0300
commitb869b73947659c45c1edc5f9cff80bfbe61e52ac (patch)
treed3c21e46b583c895109ff3f76422797dd3d4da81 /idl
parent4b326ea35cb9193dbb530b9445a778d61bf8273d (diff)
Avoid duplicate symbols when DISABLE_DYNLOADING for Android
Change-Id: Iecd0ed802f6cc715ac77256bb4b49082b5976b4f
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/types.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9186857fe81f..e6cc6295832b 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1410,6 +1410,9 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm << "#ifdef SFX_TYPEMAP" << endl
+ << "#if defined(DISABLE_DYNLOADING) && defined(ANDROID)" << endl
+ << "__attribute__((__weak__))" << endl
+ << "#endif" << endl
<< aTypeName.getStr() << aVarName.getStr()
<< " = " << endl;
rOutStm << '{' << endl