commit 1bf8f4918e169fc048fc717071ad0629d8ce5815
author Kenny Root <kroot@google.com> Fri Jun 13 22:26:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 13 22:26:59 2014 +0000
tree 339b569e9c4f8c617996a1846d4263b567096f4b
parent b9d54b3259361cd666902bd618c6c6fba00aa0e1
parent 0df67453b84d23b381e07e0d9c0d121b011ed0d2

am 0df67453: am bcc7c845: Merge changes I9abd00af,Id0e75f71

* commit '0df67453b84d23b381e07e0d9c0d121b011ed0d2':
  Upgrade to OpenSSL 1.0.1h
  Use numbering for patch orders

android-config.mk

diff --git a/android-config.mk b/android-config.mk
index 2a09113..675a65b 100644
--- a/android-config.mk
+++ b/android-config.mk
@@ -41,6 +41,8 @@
 LOCAL_CFLAGS_64 := $(filter-out -DDSO_DLFCN -DHAVE_DLFCN_H,$(LOCAL_CFLAGS_64))
 endif
 
+LOCAL_CFLAGS += -Wno-missing-field-initializers -Wno-unused-parameter
+
 # Debug
 # LOCAL_CFLAGS += -DCIPHER_DEBUG