From: Dan Stoza <stoza@google.com>
Date: Tue, 27 Jan 2015 19:49:03 +0000 (-0800)
Subject: resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~75^2~80^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22d0bdf326de00dd50a388b55540123228cbb025;p=android-x86%2Fframeworks-native.git

resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp

Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608
---

22d0bdf326de00dd50a388b55540123228cbb025
diff --cc services/surfaceflinger/Android.mk
index 13d1a55794,eade2e2210..1eb23616c3
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@@ -90,28 -90,24 +90,26 @@@ els
  endif
  
  LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
- LOCAL_CPPFLAGS := -std=c++1y
+ LOCAL_CFLAGS += -std=c++11
  
  LOCAL_SHARED_LIBRARIES := \
 -	libcutils \
 -	liblog \
 -	libdl \
 -	libhardware \
 -	libutils \
 -	libEGL \
 -	libGLESv1_CM \
 -	libGLESv2 \
 -	libbinder \
 -	libui \
 -	libgui \
 -	libpowermanager
 -
 -LOCAL_MODULE:= libsurfaceflinger
 +    libcutils \
 +    liblog \
 +    libdl \
 +    libhardware \
 +    libutils \
 +    libEGL \
 +    libGLESv1_CM \
 +    libGLESv2 \
 +    libbinder \
 +    libui \
 +    libgui \
 +    libpowermanager
 +
 +LOCAL_MODULE := libsurfaceflinger
 +
 +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
  
- include external/libcxx/libcxx.mk
- 
  include $(BUILD_SHARED_LIBRARY)
  
  ###############################################################