commit f63e25eaf25028de2d8b1495da8233ae14a5d1ff
author Conley Owens <cco3@android.com> Sun Oct 26 22:57:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 26 22:57:02 2014 +0000
tree 6c9116cbfcafdc9a55872bd2d0206ddb3d7317d7
parent 74507dae70a4779b57bd4153da96c2e04381eae6
parent 421e20aaf299384abe73c79113e75620064a2c95

am 421e20aa: am bbe96fe0: am a74b2e16: Merge "Add MODULE_LICENSE and NOTICE files"

* commit '421e20aaf299384abe73c79113e75620064a2c95':

0.153/libebl/Android.mk

diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 58b6d0d..1bca3cc 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -85,9 +85,11 @@
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
 
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+ifeq ($(HOST_OS),darwin)
+LOCAL_CFLAGS += -Wno-int-conversion
+endif
 
-LOCAL_CLANG := false
+LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
 
 LOCAL_MODULE:= libebl