summaryrefslogtreecommitdiffstats
path: root/edify/Android.mk
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-08-21 19:36:11 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-21 19:36:11 +0200
commit93fa4b677cac9288e936915f15ca8e5f76a4e4b6 (patch)
tree2aa9d806b2c6f235ea79780f6f5452927fd80df7 /edify/Android.mk
parentMerge "Fix potential crash" (diff)
parentedify: Switch to C++. (diff)
downloadandroid_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar.gz
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar.bz2
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar.lz
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar.xz
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.tar.zst
android_bootable_recovery-93fa4b677cac9288e936915f15ca8e5f76a4e4b6.zip
Diffstat (limited to 'edify/Android.mk')
-rw-r--r--edify/Android.mk16
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