summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-21 00:00:40 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 00:00:40 +0100
commit39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3 (patch)
tree1e68a9d052a3c5174501187f92d29fe43ad00801
parentam de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode (diff)
parentMerge "Global C++11 compatibility." (diff)
downloadandroid_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar.gz
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar.bz2
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar.lz
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar.xz
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.tar.zst
android_bootable_recovery-39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3.zip
Diffstat (limited to '')
-rw-r--r--edify/Android.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/edify/Android.mk b/edify/Android.mk
index 61ed6fa17..03c04e432 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -7,9 +7,10 @@ edify_src_files := \
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++.
-edify_cflags := -x 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
#
# Build the host-side command line tool