From 869c49c22573147c94b1e6d931c2cff696a54a47 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 24 Jul 2011 11:37:45 +0200
Subject: Android integration / cross-test ; Enhance Platform

- android minor build fix
- started dex'ing (gluegen-rt.apk, more to come for full junit tests)
- android remote dalvikvm launch works (crosstest-java-android-armv7-rel.sh)
- android detection, incl version (reflection)

- Platform:
 - Add JAVA_VM_NAME and JAVA_VM_RUNIME
 - OSType maybe ANDROID, where the OS name (String) is Linux ! (ok ?)
---
 make/lib/gluegen-cpptasks-android-armv7.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'make/lib')

diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml
index 17cb5c9..90db706 100644
--- a/make/lib/gluegen-cpptasks-android-armv7.xml
+++ b/make/lib/gluegen-cpptasks-android-armv7.xml
@@ -26,7 +26,6 @@
       <compilerarg value="${env.TARGET_TOOL_PATH}/libexec/gcc/${env.TARGET_ARCH}/${env.GCC_VERSION}" /> 
       <compilerarg value="-march=armv7-a" /> 
       <compilerarg value="-fpic" /> 
-      <compilerarg value="-DANDROID" /> 
       <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" /> 
@@ -37,7 +36,6 @@
       <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/libstdc++.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" /> 
@@ -45,7 +43,11 @@
       <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" />
+        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
+        <define name="DEBUG"    if="c.compiler.use-debug"/>        
+        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
       </defineset>
     </compiler>
 
-- 
cgit v1.2.3