ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

am 24cd98ee: Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]

Browse Source 
* commit '24cd98eef88ac93f80c327f8d74f0a1ae0aceee4':
  Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
This commit is contained in:
Jesse Hall 2014-07-14 21:39:12 +00:00 committed by Android Git Automerger
commit e38f5fc2b0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/surfaceflinger/Android.mk
View File

@ -1,6 +1,8 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
Client.cpp \ Client.cpp \
DisplayDevice.cpp \ DisplayDevice.cpp \
@ -81,6 +83,7 @@ else
endif endif
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_CFLAGS += -std=c++11
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils \ libcutils \

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2508,7 +2508,7 @@ bool SurfaceFlinger::startDdmConnection()
} }
void (*DdmConnection_start)(const char* name); void (*DdmConnection_start)(const char* name);
DdmConnection_start = DdmConnection_start =
(typeof DdmConnection_start)dlsym(libddmconnection_dso, "DdmConnection_start"); (decltype(DdmConnection_start))dlsym(libddmconnection_dso, "DdmConnection_start");
if (!DdmConnection_start) { if (!DdmConnection_start) {
dlclose(libddmconnection_dso); dlclose(libddmconnection_dso);
return false; return false;