From 217e7544897c45976a7feff5fbe9c19627e94dfd Mon Sep 17 00:00:00 2001 From: Saurabh Srivastava Date: Mon, 14 Mar 2016 15:30:09 +0530 Subject: Enabling CLANG compilation and fixing all resulting errors Removing statement to set LOCAL_CLANG flag explicity to true. It will be true by default. Change-Id: I2eaba5a89e64088e3383b962dceaaa7e975e997a CRs-Fixed: 989476 --- utils/Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'utils/Android.mk') diff --git a/utils/Android.mk b/utils/Android.mk index 37512a5..240d11f 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -25,10 +25,10 @@ LOCAL_SRC_FILES += \ MsgTask.cpp \ loc_misc_utils.cpp +# Flag -std=c++11 is not accepted by compiler when LOCAL_CLANG is set to true LOCAL_CFLAGS += \ -fno-short-enums \ - -D_ANDROID_ \ - -std=c++11 + -D_ANDROID_ ifeq ($(TARGET_BUILD_VARIANT),user) LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER @@ -60,7 +60,6 @@ LOCAL_COPY_HEADERS:= \ loc_misc_utils.h LOCAL_MODULE := libgps.utils -LOCAL_CLANG := false LOCAL_MODULE_TAGS := optional -- cgit v1.2.3