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

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

Browse Source 
This is necessary to use C11/C++11 stdlib atomics, which the next
change will do. This change also fixes a couple bits of syntax that
both GCC and Clang refuse to compile in -std=c++11 mode.

Change-Id: Ia14d9d6b537a3bb106c23e19a277e48be180754c
This commit is contained in:
Jesse Hall 2014-07-13 14:37:16 -07:00
parent 652c485467
commit 24cd98eef8
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)
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_SRC_FILES:= \
Client.cpp \
DisplayDevice.cpp \
@ -81,6 +83,7 @@ else
endif
LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_CFLAGS += -std=c++11
LOCAL_SHARED_LIBRARIES := \
libcutils \

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

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