From 2f6ae26a6734bd8c0f2f081bee27421a2d4e7d1f Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Wed, 20 Mar 2013 10:42:50 -0700 Subject: [PATCH] Fix build >= JB File arch-mips/sigsetjmp.S includes already defined in LOCAL_CFLAGS, and build system prior JB passes LOCAL_CFLAGS for building *.S as well, but no more >=JB. Use LOCAL_C_INCLUDES instead (pass for *.S too) Change-Id: I7e6d6e838d632f980aa6c9b6b2b2862bd7de11b1 --- ndk/sources/android/libportable/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ndk/sources/android/libportable/Android.mk b/ndk/sources/android/libportable/Android.mk index a0593be6a..82349e9f7 100644 --- a/ndk/sources/android/libportable/Android.mk +++ b/ndk/sources/android/libportable/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := libportable LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_CFLAGS := -I $(LOCAL_PATH)/common/include +LOCAL_C_INCLUDES := $(LOCAL_PATH)/common/include # Uncomment the next line to easily enable Lib-Portable logging during development. # LOCAL_CFLAGS += -DLOG_NDEBUG=0