commit 24ebd14df16750488812a59b6e200f248d234fa8
author Elliott Hughes <enh@google.com> Fri Aug 22 22:45:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 22 22:45:51 2014 +0000
tree 2a6366372be0fff30e7605630fa91e131780b0ab
parent 540b4d7df671f718cd39240f34615742dbad1103
parent 3c7c11e468715fb6c607f8fcab798bd94917568e

am 3c7c11e4: am dad1eeca: Merge "Only the host part of the elfutils build should be conditional."

* commit '3c7c11e468715fb6c607f8fcab798bd94917568e':
  Only the host part of the elfutils build should be conditional.

0.153/libebl/Android.mk

diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 08dab03..e3178c0 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -82,9 +82,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