diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 0e15506..888d2f8 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -1,6 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG := true
+
 LOCAL_SRC_FILES:= \
     Client.cpp \
     DisplayDevice.cpp \
@@ -81,6 +83,7 @@
 endif
 
 LOCAL_CFLAGS += -fvisibility=hidden
+LOCAL_CFLAGS += -std=c++11
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \