summaryrefslogtreecommitdiff
path: root/osi
diff options
context:
space:
mode:
authorMarie Janssen <jamuraa@google.com>2016-02-10 15:36:48 -0800
committerAndre Eisenbach <eisenbach@google.com>2016-02-18 10:39:14 -0800
commit75be8ac2970284b8dbd7cdb2323bd3cf80f9c6ff (patch)
tree2bb4938b6a453765cb1bcebc968a7c67af556dc9 /osi
parent37f7f8380f91221f5f49248ee09be927434b0875 (diff)
downloadandroid-system-bt-75be8ac2970284b8dbd7cdb2323bd3cf80f9c6ff.tar.gz
android-system-bt-75be8ac2970284b8dbd7cdb2323bd3cf80f9c6ff.tar.xz
osi: Don't use -std=c99 to compile
Using -std=c99 to compile breaks when we are using C++ files, which metrics uses for protobufs. Bug: 27077250 Change-Id: Ie94e3ea5d8b219671329108e7795cdc02ecc38b4
Diffstat (limited to 'osi')
-rw-r--r--osi/Android.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/osi/Android.mk b/osi/Android.mk
index 9eb5719..05037a1 100644
--- a/osi/Android.mk
+++ b/osi/Android.mk
@@ -77,9 +77,7 @@ btosiCommonIncludes := \
$(LOCAL_PATH)/../utils/include \
$(LOCAL_PATH)/../stack/include $(bdroid_C_INCLUDES)
-btosiCommonCFlags := -std=c99 -Wall -Werror -UNDEBUG -fvisibility=hidden \
- $(bdroid_CFLAGS)
-
+btosiCommonCFlags := -Wall -Werror -UNDEBUG -fvisibility=hidden $(bdroid_CFLAGS)
# protobuf library for bluetooth
# ========================================================