commit 56494af50fc87ec153f68ecb836808f7ce4d3fb1
author Dan Albert <danalbert@google.com> Thu Nov 20 23:43:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 20 23:43:33 2014 +0000
tree 17b1e93f86897dc7af0d8824be6afb78c568678d
parent 3fcf3afe83a0b67619ff6bd013b486453e495d49
parent c24d01d337ab3d449dd21f50adb882af1aae3f66

am c24d01d3: Global C++11 compatibility.

* commit 'c24d01d337ab3d449dd21f50adb882af1aae3f66':
  Global C++11 compatibility.

Android.mk

diff --git a/Android.mk b/Android.mk
index 7f17f5e..f3f3b8f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,9 +23,10 @@
 	$(LOCAL_PATH)/../libsepol/src/ \
 
 ##
-# "-x c" forces the lex/yacc files to be compiled as c
-# the build system otherwise forces them to be c++
-yacc_flags := -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.
+yacc_flags := -x c -std=gnu89
 
 
 ##