diff options
| author | Sven Gothel <[email protected]> | 2020-01-02 16:44:49 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-01-02 16:44:49 +0100 |
| commit | a4293575bb9fadf71c8e8c59d7384f69c6718b2f (patch) | |
| tree | c302c5a7993432d4619c41748f1438dcfeddced8 | |
| parent | 90830c20b6ea0497f46e4b6a8025ab33287f2a4a (diff) | |
native.tag.jar: include *.symbols
| -rw-r--r-- | make/build.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index d0e692d5..9d969945 100644 --- a/make/build.xml +++ b/make/build.xml @@ -542,6 +542,14 @@ <param name="src" value="${obj}/lib@{output.lib.name}.so" /> <param name="dest" value="${obj}/@{output.lib.name}.dll" /> </antcall> + + <gluegen.make.libsymbols builddir="${build}" + nativelib="${obj}/${native.library.prefix}@{output.lib.name}.${native.library.suffix}" + symbolsfile="${obj}/${native.library.prefix}@{output.lib.name}.symbols"/> + + <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> + <param name="libdir" value="${obj}"/> + </antcall> </sequential> </macrodef> @@ -552,10 +560,6 @@ output.lib.name="jocl" linker.cfg.id="${linker.cfg.id.base}"/> - <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> - <param name="libdir" value="../${rootrel.build}/obj"/> - </antcall> - <!-- Create Java Web Start jar file from built file --> <copy file="joclversion-natives" tofile="${build}/tempversion-natives" @@ -573,7 +577,7 @@ nativejarfile="${build}/jar/jocl-natives-${os.and.arch}.jar" manifestfile="${build}/tempversion-natives" module="opencl" - includelibs="*jocl.${native.library.suffix}" /> + includelibs="*jocl.${native.library.suffix} *jocl.symbols" /> <!-- Produce duplicates for different configurations, since non-native-jar aliasing (Bug 1023/Bug 1024) --> <copy file="${build}/jar/jocl-natives-${os.and.arch}.jar" tofile="${build}/jar/jocl-android-natives-${os.and.arch}.jar"/> |