summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2014-08-21 15:54:58 -0700
committerConley Owens <cco3@android.com>2014-08-21 23:00:20 +0000
commite8f2790fbf876f4a996d56ad0ddddfa40025a92a (patch)
tree2d7f886be7241a17a936ca78b67b860632f32988
parent92bb84b13fdca9a9d844ac9b209f943eaaf7ae33 (diff)
downloadandroid_external_elfutils-staging/cm-12.0.tar.gz
android_external_elfutils-staging/cm-12.0.tar.bz2
android_external_elfutils-staging/cm-12.0.zip
Remove bad gcc flag for Darwin. DO NOT MERGEstaging/cm-12.0-cafstaging/cm-12.0
gcc can't handle the -Wno-int-conversion, so we need to remove this condition for Darwin and replace it with the appropriate LOCAL_CLANG := false Change-Id: I9a2861535d865f447014b1fce353b86feea90d22
-rwxr-xr-x0.153/libebl/Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/0.153/libebl/Android.mk b/0.153/libebl/Android.mk
index 224c7970..85a88d07 100755
--- a/0.153/libebl/Android.mk
+++ b/0.153/libebl/Android.mk
@@ -85,12 +85,10 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
-ifeq ($(HOST_OS),darwin)
-LOCAL_CFLAGS += -Wno-int-conversion
-endif
-
LOCAL_CFLAGS += -include $(LOCAL_PATH)/../host-$(HOST_OS)-fixup/AndroidFixup.h
+LOCAL_CLANG := false
+
LOCAL_MODULE:= libebl
include $(BUILD_HOST_STATIC_LIBRARY)