diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk
index 41e6c4d8a..c7ed1f5c9 100644
--- a/libstdc++/Android.mk
+++ b/libstdc++/Android.mk
@@ -9,6 +9,7 @@ ifeq ($(TARGET_CPU_SMP),true)
 else
     libstdc++_cflags += -DANDROID_SMP=0
 endif
+libstdc++_cflags += -Wall -Wextra -Werror
 
 include $(CLEAR_VARS)
 
diff --git a/libstdc++/src/typeinfo.cpp b/libstdc++/src/typeinfo.cpp
index b426f1a58..928d2ea00 100644
--- a/libstdc++/src/typeinfo.cpp
+++ b/libstdc++/src/typeinfo.cpp
@@ -7,26 +7,21 @@ type_info::type_info() {
 type_info::~type_info() {
 }
 
-char const *
-type_info::name() const {
-    return "N/A";
+char const* type_info::name() const {
+  return "N/A";
 }
 
-bool 
-type_info::operator==(type_info const & right) const {
-    return false;
+bool type_info::operator==(type_info const& /*rhs*/) const {
+  return false;
 }
 
-bool 
-type_info::operator!=(type_info const & right) const {
-    return false;
+bool type_info::operator!=(type_info const& /*rhs*/) const {
+  return false;
 }
 
-bool
-type_info::before(type_info const & right) const {
-    return false;
+bool type_info::before(type_info const& /*rhs*/) const {
+  return false;
 }
 
-type_info::type_info(type_info const & right) {
+type_info::type_info(type_info const& /*rhs*/) {
 }
-