Fix build-stlport.sh to use platforms/android-X/arch-<arch> as --sysroot
Actually, --sysroot is setup in builder-funcs.sh builder_begin_android(),
but build-stlport.sh calls builder_reset_cflags/cxxflags and forgets
about that. The results are
1. toolchains/*/*/*/sysroot is used instead. During regular rebuild of
host toolchain, "gen-platforms.sh --minimal" populates it with android-9
header/libraries so we are fine. No luck in NDK release package since
sysroot is removed.
2. stlport armeabi-v7a isn't built with -march=armv7-a -mthumb
The fixes:
1. Modify builder_reset_* to optionally take variable to hold the original
$_BUILD_* before reset
2. Modify build-stlport.sh to retrieve DEFAULT_CFLAGS and DEFAULT_CXXLAGS
3. Also add -march=armv7-a for arm linker when building for armeabi-v7a
See
https://code.google.com/p/android/issues/detail?id=52835
Change-Id: I0a52c71a3ceb2b4d1222fdddd0780aa094568689
2 files changed
