diff options
| author | Conley Owens <cco3@android.com> | 2014-08-21 15:54:58 -0700 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2014-08-21 23:00:20 +0000 |
| commit | e8f2790fbf876f4a996d56ad0ddddfa40025a92a (patch) | |
| tree | 2d7f886be7241a17a936ca78b67b860632f32988 | |
| parent | 92bb84b13fdca9a9d844ac9b209f943eaaf7ae33 (diff) | |
| download | elfutils-lollipop-mr1-fi-release.tar.gz | |
Remove bad gcc flag for Darwin. DO NOT MERGEandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
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-x | 0.153/libebl/Android.mk | 6 |
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) |