diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 19:37:48 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-09-13 19:37:48 -0400 |
| commit | e8913472129bc3a3b85728df225564fc8f633ff3 (patch) | |
| tree | 9a16b599c3e1669f3600f3c9c4d31f7f3545347e /TestScripts | |
| parent | 1c41da35bccb4164851b3475b5c8954cf11cac03 (diff) | |
| download | cryptopp-git-e8913472129bc3a3b85728df225564fc8f633ff3.tar.gz | |
Clear TODO items for setenv-android.sh for 6.0 (GH #491)
Diffstat (limited to 'TestScripts')
| -rwxr-xr-x | TestScripts/setenv-android.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/TestScripts/setenv-android.sh b/TestScripts/setenv-android.sh index b14d605a..04191133 100755 --- a/TestScripts/setenv-android.sh +++ b/TestScripts/setenv-android.sh @@ -26,10 +26,6 @@ unset AOSP_STL_INC unset AOSP_STL_LIB unset AOSP_BITS_INC -# Former variables -unset ANDROID_FLAGS ANDROID_SYSROOT -unset ANDROID_STL_INC ANDROID_STL_LIB - # Tools set by this script unset CPP CC CXX LD AS AR RANLIB STRIP @@ -175,9 +171,6 @@ esac export IS_ANDROID=1 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 CC="$TOOLCHAIN_NAME-gcc" export CXX="$TOOLCHAIN_NAME-g++" @@ -274,9 +267,6 @@ fi # http://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html 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. @@ -348,10 +338,6 @@ fi export AOSP_STL_INC 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 export AOSP_BITS_INC fi |