commit 7c7e7a61d2f01bab0ad961469c087c761bb47ec8
author James Hawkins <jhawkins@google.com> Tue Feb 23 15:57:18 2016 -0800
committer James Hawkins <jhawkins@google.com> Tue Feb 23 15:57:18 2016 -0800
tree 72f9e6711a662582e3e976a1fe8fe85a2033e907
parent 5ba2bf74d75d9753f9aec1e83798070e78918109
parent e298f1f8f5094b8a7f1eccdaf97bf107b4b5db47

resolve merge conflicts of e298f1f8f5 to nyc-dev-plus-aosp

Change-Id: I92fda1fc05de05430ab634edb92c9dea341a7dfe

Android.mk

diff --git a/Android.mk b/Android.mk
index 76df4f1..1c6e898 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,13 @@
 
 common_CFLAGS := \
 	-DHAVE_VISIBILITY=1 \
-	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
+	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 \
+	-Wno-enum-conversion \
+	-Wno-missing-field-initializers \
+	-Wno-pointer-arith \
+	-Wno-sign-compare \
+	-Wno-tautological-compare \
+	-Wno-unused-parameter
 
 # Static library for the device (recovery)
 include $(CLEAR_VARS)