commit 1665c8e1012e535743683d9812bf28c35ee2f10a
author Dan Stoza <stoza@google.com> Tue Jan 27 10:32:10 2015 -0800
committer Dan Stoza <stoza@google.com> Tue Jan 27 11:03:50 2015 -0800
tree 32321d8a1ac4f81bb8c0143f00a8fc72e790c22c
parent ef1c17ae9417abc1e21e49dbc629e448efc947dc

Revert "SurfaceFlinger: Attempt to attribute fds to layers"

This reverts commit 03eccb6616744c3789b6018680de7bf5a18f71ce.

Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index af271b2..eade2e2 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -90,7 +90,7 @@
 endif
 
 LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
-LOCAL_CFLAGS += -std=c++1y
+LOCAL_CFLAGS += -std=c++11
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
@@ -108,8 +108,6 @@
 
 LOCAL_MODULE:= libsurfaceflinger
 
-include external/libcxx/libcxx.mk
-
 include $(BUILD_SHARED_LIBRARY)
 
 ###############################################################