arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear TODO items for setenv-android.sh for 6.0 (GH #491)

pull/507/head
Jeffrey Walton 2017-09-13 19:37:48 -04:00
parent 1c41da35bc
commit e891347212
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TestScripts/setenv-android.sh
View File

@ -26,10 +26,6 @@ unset AOSP_STL_INC
unset AOSP_STL_LIB unset AOSP_STL_LIB
unset AOSP_BITS_INC unset AOSP_BITS_INC
# Former variables
unset ANDROID_FLAGS ANDROID_SYSROOT
unset ANDROID_STL_INC ANDROID_STL_LIB
# Tools set by this script # Tools set by this script
unset CPP CC CXX LD AS AR RANLIB STRIP unset CPP CC CXX LD AS AR RANLIB STRIP
@ -175,9 +171,6 @@ esac
export IS_ANDROID=1 export IS_ANDROID=1
export AOSP_FLAGS export AOSP_FLAGS
# TODO: for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_FLAGS=$AOSP_FLAGS
export CPP="$TOOLCHAIN_NAME-cpp" export CPP="$TOOLCHAIN_NAME-cpp"
export CC="$TOOLCHAIN_NAME-gcc" export CC="$TOOLCHAIN_NAME-gcc"
export CXX="$TOOLCHAIN_NAME-g++" export CXX="$TOOLCHAIN_NAME-g++"
@ -274,9 +267,6 @@ fi
# http://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html # http://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
export AOSP_SYSROOT="$ANDROID_NDK_ROOT/platforms/$AOSP_API/$AOSP_ARCH" export AOSP_SYSROOT="$ANDROID_NDK_ROOT/platforms/$AOSP_API/$AOSP_ARCH"
# TODO: export for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_SYSROOT=$AOSP_SYSROOT
##################################################################### #####################################################################
# Android STL. We support GNU, LLVM and STLport out of the box. # Android STL. We support GNU, LLVM and STLport out of the box.
@ -348,10 +338,6 @@ fi
export AOSP_STL_INC export AOSP_STL_INC
export AOSP_STL_LIB export AOSP_STL_LIB
# TODO: for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_STL_INC=$AOSP_STL_INC
export ANDROID_STL_LIB=$AOSP_STL_LIB
if [ ! -z "$AOSP_BITS_INC" ]; then if [ ! -z "$AOSP_BITS_INC" ]; then
export AOSP_BITS_INC export AOSP_BITS_INC
fi fi

14
setenv-android.sh
View File

@ -26,10 +26,6 @@ unset AOSP_STL_INC
unset AOSP_STL_LIB unset AOSP_STL_LIB
unset AOSP_BITS_INC unset AOSP_BITS_INC
# Former variables
unset ANDROID_FLAGS ANDROID_SYSROOT
unset ANDROID_STL_INC ANDROID_STL_LIB
# Tools set by this script # Tools set by this script
unset CPP CC CXX LD AS AR RANLIB STRIP unset CPP CC CXX LD AS AR RANLIB STRIP
@ -175,9 +171,6 @@ esac
export IS_ANDROID=1 export IS_ANDROID=1
export AOSP_FLAGS export AOSP_FLAGS
# TODO: for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_FLAGS=$AOSP_FLAGS
export CPP="$TOOLCHAIN_NAME-cpp" export CPP="$TOOLCHAIN_NAME-cpp"
export CC="$TOOLCHAIN_NAME-gcc" export CC="$TOOLCHAIN_NAME-gcc"
export CXX="$TOOLCHAIN_NAME-g++" export CXX="$TOOLCHAIN_NAME-g++"
@ -274,9 +267,6 @@ fi
# http://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html # http://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
export AOSP_SYSROOT="$ANDROID_NDK_ROOT/platforms/$AOSP_API/$AOSP_ARCH" export AOSP_SYSROOT="$ANDROID_NDK_ROOT/platforms/$AOSP_API/$AOSP_ARCH"
# TODO: export for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_SYSROOT=$AOSP_SYSROOT
##################################################################### #####################################################################
# Android STL. We support GNU, LLVM and STLport out of the box. # Android STL. We support GNU, LLVM and STLport out of the box.
@ -348,10 +338,6 @@ fi
export AOSP_STL_INC export AOSP_STL_INC
export AOSP_STL_LIB export AOSP_STL_LIB
# TODO: for the previous GNUmakefile-cross. These can go away eventually.
export ANDROID_STL_INC=$AOSP_STL_INC
export ANDROID_STL_LIB=$AOSP_STL_LIB
if [ ! -z "$AOSP_BITS_INC" ]; then if [ ! -z "$AOSP_BITS_INC" ]; then
export AOSP_BITS_INC export AOSP_BITS_INC
fi fi