summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/Android.mk
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-01-27 10:32:10 -0800
committerDan Stoza <stoza@google.com>2015-01-27 11:03:50 -0800
commit1665c8e1012e535743683d9812bf28c35ee2f10a (patch)
tree32321d8a1ac4f81bb8c0143f00a8fc72e790c22c /services/surfaceflinger/Android.mk
parentef1c17ae9417abc1e21e49dbc629e448efc947dc (diff)
downloadframeworks_native-1665c8e1012e535743683d9812bf28c35ee2f10a.zip
frameworks_native-1665c8e1012e535743683d9812bf28c35ee2f10a.tar.gz
frameworks_native-1665c8e1012e535743683d9812bf28c35ee2f10a.tar.bz2
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
This reverts commit 03eccb6616744c3789b6018680de7bf5a18f71ce. Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
Diffstat (limited to 'services/surfaceflinger/Android.mk')
-rw-r--r--services/surfaceflinger/Android.mk4
1 files changed, 1 insertions, 3 deletions
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 @@ else
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_SHARED_LIBRARIES := \
LOCAL_MODULE:= libsurfaceflinger
-include external/libcxx/libcxx.mk
-
include $(BUILD_SHARED_LIBRARY)
###############################################################