aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-11-07 07:52:34 +0900
committerKen Wakasa <kwakasa@google.com>2012-11-07 07:52:34 +0900
commitf775bf3b6f424c8ae946b9dfbff85be84d281280 (patch)
treeb6f217f43a743426191c393acd10203fd748e6e8
parent796050d1444af88154ac02ec0106c5bc8b2762f1 (diff)
downloadlatinime-f775bf3b6f424c8ae946b9dfbff85be84d281280.tar.gz
latinime-f775bf3b6f424c8ae946b9dfbff85be84d281280.tar.xz
latinime-f775bf3b6f424c8ae946b9dfbff85be84d281280.zip
Fix a build error in x86 builds
Change-Id: I64a7c35d01540eb63f09cacddaab03f95729ed02
-rw-r--r--native/jni/Android.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index da05894f5..ac3364902 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -29,8 +29,11 @@ LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) $(LATIN_IME_SRC_FULLPATH_DIR)/gesture
LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \
- -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls \
- -Winline -Wno-system-headers
+ -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers
+
+ifeq ($(TARGET_ARCH), arm)
+LOCAL_CFLAGS += -Winline
+endif
# To suppress compiler warnings for unused variables/functions used for debug features etc.
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function