diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-11-07 16:20:20 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-11-07 16:20:20 +0900 |
| commit | cfddbde41a4f399aae5f06ea604c423f8ade9787 (patch) | |
| tree | 43bdd6f6c5f795b76397ebc89308fd6eab41a196 | |
| parent | 6962a566f43875317cdac1e8ecdf10013c598a2d (diff) | |
| parent | f775bf3b6f424c8ae946b9dfbff85be84d281280 (diff) | |
| download | latinime-cfddbde41a4f399aae5f06ea604c423f8ade9787.tar.gz latinime-cfddbde41a4f399aae5f06ea604c423f8ade9787.tar.xz latinime-cfddbde41a4f399aae5f06ea604c423f8ade9787.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
| -rw-r--r-- | native/jni/Android.mk | 7 |
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 |