diff options
| author | Sven Gothel <[email protected]> | 2011-07-24 22:04:40 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-24 22:04:40 +0200 |
| commit | 625727ee75b758bef4f9f5f3816b37547c9f6875 (patch) | |
| tree | 63fce88fa5e37abe2e852608a8b79ac8f28029d0 /make/lib | |
| parent | 26374fad042f4a33f799cdee367dc903b27a44f7 (diff) | |
Cleaned up android build ; Cross junit/java android test/script; Fix Test1p2ProcAddressEmitter
Fix Test1p2ProcAddressEmitter
- 3 tests used the wrong binding instance,
where no native lib was loaded for - duh :)
Cleaned up android build
- add unix src (UnixDynamicLinkerImpl_JNI.c)
- remove linker cmds in compile arguments
Cross junit/java android test works via script
- target command scrip is written to file, pushed and executed
Status: com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
- passed
- on par w/ linux-armv7
Diffstat (limited to 'make/lib')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index 90db706..38b42f2 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -28,20 +28,6 @@ <compilerarg value="-fpic" /> <compilerarg value="${env.NDK_INCLUDE}" /> <compilerarg value="-I${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/include" /> <!--inclides stdarg.h --> - <compilerarg value="-Wl,--demangle" /> - <compilerarg value="-nostdlib" /> - <compilerarg value="-Bdynamic" /> - <compilerarg value="-Wl,-dynamic-linker,/system/bin/linker" /> - <compilerarg value="-Wl,--gc-sections" /> - <compilerarg value="-Wl,-z,nocopyreloc" /> - <compilerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> - <compilerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> - <compilerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> -<!-- <compilerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> --> - <compilerarg value="-Wl,--no-undefined" /> - <compilerarg value="-Wl,-rpath-link=${env.TARGET_OS_PATH}/lib" /> - <compilerarg value="${env.TARGET_TOOL_PATH}/lib/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}/${env.TARGET_CPU_NAME}/libgcc.a" /> - <compilerarg value="${env.TARGET_OS_PATH}/lib/crtend_android.o" /> <defineset> <define name="__unix__"/> <define name="ANDROID" /> @@ -53,6 +39,8 @@ <!--<linker id="linker.cfg.android" name="arm-linux-androideabi-gcc">--> <linker id="linker.cfg.android" name="gcc"> + <linkerarg value="-march=armv7-a" /> + <linkerarg value="-fpic" /> <linkerarg value="-Wl,--demangle" /> <linkerarg value="--sysroot=${env.TARGET_OS_PATH}" /> <!-- set root dir for lib and include --> <linkerarg value="-nostdlib" /> @@ -62,7 +50,6 @@ <linkerarg value="-Wl,-z,nocopyreloc" /> <linkerarg value="${env.TARGET_OS_PATH}/lib/libc.so" /> <linkerarg value="${env.TARGET_OS_PATH}/lib/libdl.so" /> -<!-- <linkerarg value="${env.TARGET_OS_PATH}/lib/libstdc++.so" /> --> <linkerarg value="${env.TARGET_OS_PATH}/lib/libm.so" /> <!-- <linkerarg value="${env.TARGET_OS_PATH}/lib/crtbegin_dynamic.o" /> --> <linkerarg value="-Wl,--no-undefined" /> |