Changeset 504:b3b4cff9ff94 in verona

Timestamp:

Jul 17, 2012 4:46:25 PM (10 months ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Message:

android build scripts

Location:

build

Files:

• android-vars.sh (modified) (1 diff)
• android.toolchain.cmake (modified) (5 diffs)

build/android-vars.sh

@@ -1 +1 @@
 #!/bin/sh
-export ANDROID_STANDALONE_TOOLCHAIN=$HOME/android-toolchain9
 
+export ANDROID_TOOLCHAIN=$HOME/android-toolchain9
+export PATH=$ANDROID_TOOLCHAIN/bin:$PATH
+export SYSROOT=$ANDROID_TOOLCHAIN/sysroot
+export CC="arm-linux-androideabi-gcc --sysroot=$SYSROOT"
+export CXX="arm-linux-androideabi-g++ --sysroot=$SYSROOT"
+export CFLAGS='-mthumb -g -O0 -W -Wall' 
+export CXXFLAGS="-mthumb -O0 -g -W -Wall" 
+export LDFLAGS='-Wl,--fix-cortex-a8' 
+export LIBS='-lstdc++ -lsupc++' 
+export CMAKE_FIND_ROOT_PATH=$SYSROOT
 
-echo cmake -DCMAKE_TOOLCHAIN_FILE=$1/build/android.toolchain.cmake $1 -DCMAKE_BUILD_TYPE=Debug -DDUMMYCSL=1 -DUSE_CSL=1 -DUSE_SWIG=1 -DANDROID_NATIVE_API_LEVEL=android-9
-cmake -DCMAKE_TOOLCHAIN_FILE=$1/build/android.toolchain.cmake $1 -DCMAKE_BUILD_TYPE=Debug -DDUMMYCSL=1 -DUSE_CSL=1 -DUSE_SWIG=1 -DANDROID_NATIVE_API_LEVEL=android-9
+echo cmake -DCMAKE_FIND_ROOT_PATH=$CMAKE_FIND_ROOT_PATH  -DCMAKE_TOOLCHAIN_FILE=$1/build/Toolchain-android.cmake $1 -DCMAKE_BUILD_TYPE=Debug -DUSE_SWIG=1
+cmake -DCMAKE_FIND_ROOT_PATH=$CMAKE_FIND_ROOT_PATH  -DCMAKE_TOOLCHAIN_FILE=$1/build/Toolchain-android.cmake $1 -DCMAKE_BUILD_TYPE=Debug -DUSE_SWIG=1
+

build/android.toolchain.cmake

@@ -704 +704 @@
 if( ARMEABI OR ARMEABI_V7A )
  # NDK also defines -ffunction-sections -funwind-tables but they result in worse OpenCV performance
- set( CMAKE_CXX_FLAGS "-fPIC -Wno-psabi -ffunction-sections -funwind-tables" )
- set( CMAKE_C_FLAGS "-fPIC -Wno-psabi -ffunction-sections -funwind-tables" )
+ set( CMAKE_CXX_FLAGS "-fPIC -Wno-psabi" )
+ set( CMAKE_C_FLAGS "-fPIC -Wno-psabi" )
  if( ANDROID_USE_STLPORT )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions" )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions" )
+  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  -fno-exceptions" )
  else()
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti -fexceptions" )
@@ -722 +722 @@
  if( ANDROID_USE_STLPORT )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions" )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions" )
+  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions" )
  else()
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frtti -fexceptions" )
@@ -740 +740 @@
   set( CMAKE_CXX_FLAGS_RELEASE "-mthumb -O3" )
   set( CMAKE_C_FLAGS_RELEASE   "-mthumb -O3" )
-  set( CMAKE_CXX_FLAGS_DEBUG "-mthumb -Os -finline-limit=64" )
-  set( CMAKE_C_FLAGS_DEBUG   "-mthumb -Os -finline-limit=64" )
+  set( CMAKE_CXX_FLAGS_DEBUG "-mthumb -O0 -g -finline-limit=64" )
+  set( CMAKE_C_FLAGS_DEBUG   "-mthumb -O0 -g -finline-limit=64" )
  else()
   # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI
@@ -747 +747 @@
   set( CMAKE_CXX_FLAGS_RELEASE "-marm -O3 -fstrict-aliasing" )
   set( CMAKE_C_FLAGS_RELEASE   "-marm -O3 -fstrict-aliasing" )
-  set( CMAKE_CXX_FLAGS_DEBUG "-marm -O0 -finline-limit=300" )
-  set( CMAKE_C_FLAGS_DEBUG   "-marm -O0 -finline-limit=300" )
+  set( CMAKE_CXX_FLAGS_DEBUG "-marm -O0 -g -finline-limit=300" )
+  set( CMAKE_C_FLAGS_DEBUG   "-marm -O0 -g -finline-limit=300" )
  endif()
 elseif( X86 )
  set( CMAKE_CXX_FLAGS_RELEASE "-O3 -fstrict-aliasing" )
  set( CMAKE_C_FLAGS_RELEASE   "-O3 -fstrict-aliasing" )
- set( CMAKE_CXX_FLAGS_DEBUG "-O0 -finline-limit=300" )
- set( CMAKE_C_FLAGS_DEBUG   "-O0 -finline-limit=300" )
+ set( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -finline-limit=300" )
+ set( CMAKE_C_FLAGS_DEBUG   "-O0 -g -finline-limit=300" )
 endif()
 set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -DNDEBUG" )
@@ -860 +860 @@
 set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "c++ Debug flags" )
 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "c Debug flags" )
-set( CMAKE_SHARED_LINKER_FLAGS "${LINKER_FLAGS} -Wl,-z,noexecstack -Wl,--whole-archive   -Wl,--no-whole-archive -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/build/armelf.xsc -Wl,--gc-sections" CACHE STRING "linker flags" )
+set( CMAKE_SHARED_LINKER_FLAGS "${LINKER_FLAGS} -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/build/armelf.xsc" CACHE STRING "linker flags" )
 set( CMAKE_MODULE_LINKER_FLAGS "${LINKER_FLAGS}" CACHE STRING "linker flags" )
 set( CMAKE_EXE_LINKER_FLAGS "-Wl,--gc-sections -Wl,-z,nocopyreloc ${LINKER_FLAGS}" CACHE STRING "linker flags" )