aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2016-05-29 23:10:01 +0200
committerIngo Bauersachs <ingo@jitsi.org>2016-05-29 23:14:09 +0200
commit8bee4d318ea5a5bf29a83e02a5ec8d68e74434df (patch)
treebc22c9801d30b45409e98ab68110a4d61c5cc043 /lib
parent98dc2c732e2ae6891d35cd0c024cc6975931fb32 (diff)
downloadjitsi-8bee4d318ea5a5bf29a83e02a5ec8d68e74434df.zip
jitsi-8bee4d318ea5a5bf29a83e02a5ec8d68e74434df.tar.gz
jitsi-8bee4d318ea5a5bf29a83e02a5ec8d68e74434df.tar.bz2
Stop messing with the JNA manifest and libraries
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties3
-rw-r--r--lib/felix.unit.test.properties3
-rw-r--r--lib/installer-exclude/jna.manifest.mf12
3 files changed, 4 insertions, 14 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index c596e49..e36bf54 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -105,7 +105,8 @@ felix.auto.start.35= \
felix.auto.start.40= \
reference:file:sc-bundles/jmdnslib.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
reference:file:sc-bundles/provdisc.jar \
reference:file:sc-bundles/jfontchooserlib.jar \
reference:file:sc-bundles/netaddr.jar \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index b4f1a7f..5db3a83 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -112,7 +112,8 @@ felix.auto.start.40= \
reference:file:sc-bundles/jfontchooserlib.jar \
reference:file:sc-bundles/version-impl.jar \
reference:file:sc-bundles/keybindings.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
reference:file:sc-bundles/netaddr.jar \
reference:file:sc-bundles/sysactivitynotifications.jar \
reference:file:sc-bundles/browserlauncher.jar \
diff --git a/lib/installer-exclude/jna.manifest.mf b/lib/installer-exclude/jna.manifest.mf
deleted file mode 100644
index 0c32920..0000000
--- a/lib/installer-exclude/jna.manifest.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-Name: JNA Lib Provider
-Bundle-Description: JNA Lib Provider
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: com.sun.jna
-Export-Package: com.sun.jna.win32,
- com.sun.jna,
- com.sun.jna.ptr,
- com.sun.jna.platform,
- com.sun.jna.platform.win32
-
-