Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24cd98ee authored by Jesse Hall's avatar Jesse Hall
Browse files

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

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
parent 652c4854

services/surfaceflinger/Android.mk

+3 −0
Original line number Diff line number Diff line 
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 \

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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;

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+3 −3

File changed.

Contains only whitespace changes.