commit 5ec24b53b258f2be20c5913b5be0f54b61296905
author Ben Cheng <bccheng@android.com> Tue Sep 03 16:26:36 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 03 16:26:36 2013 +0000
tree e7b1b6fad9a3e2022febfe6656b8877e5daf4617
parent 2db19c77b59c71eef27e9876d4c09ceb6966608d
parent 7a7e1a448079c2fd6b1696f2ccf6258a0b60a1ba

Merge "Fix build with gcc-4.8"

Android.mk

diff --git a/Android.mk b/Android.mk
index 2a91487..9aee506 100644
--- a/Android.mk
+++ b/Android.mk
@@ -146,7 +146,7 @@
 # for various GNU extensions
 LOCAL_CFLAGS += -include external/elfutils/bionic-fixup/AndroidFixup.h
 
-LOCAL_CFLAGS += -Wno-attributes -Werror
+LOCAL_CFLAGS += -Wno-attributes -Werror -Wno-error=unused-parameter
 
 LOCAL_C_INCLUDES := external/elfutils external/elfutils/libelf external/elfutils/libdw external/elfutils/libdwfl
 
@@ -261,7 +261,7 @@
 LOCAL_CFLAGS += -DPERF_INFO_PATH='""'
 LOCAL_CFLAGS += -DPERF_VERSION='"perf.3.0.8_android"'
 
-LOCAL_CFLAGS += -Wno-attributes -Werror
+LOCAL_CFLAGS += -Wno-attributes -Werror -Wno-error=unused-parameter
 
 include $(BUILD_EXECUTABLE)