Correct typo
1. Fixed gen-platforms.sh fails to cleanup samples directory
2. 64-bit windows host tool can be built now
3. Fix compilation warning in cxxabi.h
4. Document LOCAL_LDFLAGS
Change-Id: I997af9102d9e53db2c8227b3c3ef6b50e9943f20
diff --git a/build/tools/gen-platforms.sh b/build/tools/gen-platforms.sh
index 2fc7d8a..3252fc7 100755
--- a/build/tools/gen-platforms.sh
+++ b/build/tools/gen-platforms.sh
@@ -657,7 +657,7 @@
# $SRC/android-$PLATFORM/samples/ --> $DST/samples
#
dump "Copying generic samples"
- if [ -z "OPTION_OVERLAY" ]; then
+ if [ -z "$OPTION_OVERLAY" ]; then
rm -rf $DSTDIR/samples && mkdir -p $DSTDIR/samples
fi
copy_src_directory samples samples samples
diff --git a/docs/ANDROID-MK.html b/docs/ANDROID-MK.html
index e431694..accc01f 100644
--- a/docs/ANDROID-MK.html
+++ b/docs/ANDROID-MK.html
@@ -548,6 +548,13 @@
See docs/STABLE-APIS.html for the list of exposed system libraries you
can linked against with this NDK release.
+LOCAL_LDFLAGS
+ The list of other linker flags to be used when building your module.
+ For example, the following will use linker ld.bfd on ARM/X86 GCC 4.6/4.7
+ where ld.gold is the default
+
+ LOCAL_LDFLAGS += -fuse-ld=bfd
+
LOCAL_ALLOW_UNDEFINED_SYMBOLS
By default, any undefined reference encountered when trying to build
a shared library will result in an "undefined symbol" error. This is a
diff --git a/docs/STANDALONE-TOOLCHAIN.html b/docs/STANDALONE-TOOLCHAIN.html
index 3763a16..c7a428e 100644
--- a/docs/STANDALONE-TOOLCHAIN.html
+++ b/docs/STANDALONE-TOOLCHAIN.html
@@ -96,7 +96,7 @@
You may specify --system=linux-x86_64 on 64-bit Linux or --system=darwin-x86_64 on 64-bit
MacOSX to make 64-bit host toolchain instead of the 32-bit one (default).
-64-bit Windows toolchain isn't available yet. See IV of NDK-BUILD.html
+See IV of NDK-BUILD.html
You can later use it directly with something like:
diff --git a/sources/cxx-stl/gabi++/include/cxxabi.h b/sources/cxx-stl/gabi++/include/cxxabi.h
index a064c70..c6a4f8a 100644
--- a/sources/cxx-stl/gabi++/include/cxxabi.h
+++ b/sources/cxx-stl/gabi++/include/cxxabi.h
@@ -265,7 +265,7 @@
extern "C" {
// Compatible with GNU C++
- const uint64_t __gxx_exception_class = 0x474E5543432B2B00; // GNUCC++\0
+ const uint64_t __gxx_exception_class = 0x474E5543432B2B00LL; // GNUCC++\0
// TODO: Support dependent exception
// TODO: Support C++0x exception propagation
