diff options
| author | Tao Bao <tbao@google.com> | 2015-08-21 20:20:17 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 20:20:17 +0200 |
| commit | 822685a8648e91aca6ce35992087c18165d4d609 (patch) | |
| tree | 41f6eaada8de57f11eabd573f351490d1abe9f52 /edify/Android.mk | |
| parent | am 4854e292: am ad509fd4: Merge "Fix potential crash" (diff) | |
| parent | am 93fa4b67: Merge "edify: Switch to C++." (diff) | |
| download | android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar.gz android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar.bz2 android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar.lz android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar.xz android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.tar.zst android_bootable_recovery-822685a8648e91aca6ce35992087c18165d4d609.zip | |
Diffstat (limited to 'edify/Android.mk')
| -rw-r--r-- | edify/Android.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/edify/Android.mk b/edify/Android.mk index eb366c287..9b859d42e 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -5,12 +5,7 @@ LOCAL_PATH := $(call my-dir) edify_src_files := \ lexer.l \ parser.y \ - expr.c - -# "-x c" forces the lex/yacc files to be compiled as c the build system -# otherwise forces them to be c++. Need to also add an explicit -std because the -# build system will soon default C++ to -std=c++11. -edify_cflags := -x c -std=gnu89 + expr.cpp # # Build the host-side command line tool @@ -19,12 +14,13 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(edify_src_files) \ - main.c + main.cpp -LOCAL_CPPFLAGS := $(edify_cflags) -g -O0 +LOCAL_CPPFLAGS := -g -O0 LOCAL_MODULE := edify LOCAL_YACCFLAGS := -v LOCAL_CPPFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_CLANG := true include $(BUILD_HOST_EXECUTABLE) @@ -36,8 +32,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(edify_src_files) -LOCAL_CPPFLAGS := $(edify_cflags) -LOCAL_CPPFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS := -Wno-unused-parameter +LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_MODULE := libedify LOCAL_CLANG := true |