commit 298b0f623765f87776c13236cf20d852c2dbb8f8
author The Android Open Source Project <initial-contribution@android.com> Fri Dec 06 01:43:29 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 06 01:43:29 2013 +0000
tree 1d8ceb7ce1afb302f47304a5c0ea3f9c111e7c3c
parent 81899d5af5466d72f3d58f492df6f4d3cc7a2b81
parent 089233875ed919c8d4bac1dd81453b4fd5399da6

am 08923387: am b6fd742f: Merge commit \'d0792d40dafce044bbf0f10f2c680120ded8c203\' into HEAD

* commit '089233875ed919c8d4bac1dd81453b4fd5399da6':

Android.libv8.mk

diff --git a/Android.libv8.mk b/Android.libv8.mk
index 25691a6..586980c 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -87,7 +87,8 @@
 	-DENABLE_DEBUGGER_SUPPORT \
 	-DENABLE_LOGGING_AND_PROFILING \
 	-DENABLE_VMSTATE_TRACKING \
-	-DV8_NATIVE_REGEXP
+	-DV8_NATIVE_REGEXP \
+	-Wno-unused-parameter
 
 ifeq ($(TARGET_ARCH),arm)
 	LOCAL_CFLAGS += -DARM -DV8_TARGET_ARCH_ARM

Android.mksnapshot.mk

diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 9ab80b4..c945314 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -83,7 +83,8 @@
 	-DENABLE_DEBUGGER_SUPPORT \
 	-DENABLE_LOGGING_AND_PROFILING \
 	-DENABLE_VMSTATE_TRACKING \
-	-DV8_NATIVE_REGEXP
+	-DV8_NATIVE_REGEXP \
+	-Wno-unused-parameter
 
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_CFLAGS += -DV8_TARGET_ARCH_ARM