summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-11-25 23:58:22 +0200
committerTor Lillqvist <tlillqvist@suse.com>2011-11-26 00:23:47 +0200
commit591191038e9d3847b258ab467182497e736d2cfb (patch)
tree1c432f262e18f51eae7f107bfe12801b88435f4c /jvmfwk
parentce5f65f335096a8e2200a47cee19c36ca1507e41 (diff)
Use ENFORCEDSHLPREFIX for Android
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/makefile.mk2
-rw-r--r--jvmfwk/prj/d.lst1
2 files changed, 2 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 27dc8da7929e..78f1457e49d0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -60,7 +60,7 @@ LIB1OBJFILES= $(SLOFILES)
LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
-SHL1TARGET= $(UNOCOMPONENT1)
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1)
SHL1STDLIBS= \
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 09bc295ddb40..e8753d14d95c 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\jvmfwk
..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
+..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\*
..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class
..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class