ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 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 \

6
services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
View File

@ -28,11 +28,11 @@ static const bool sForceHwcCopy = true;
static const bool sForceHwcCopy = false; static const bool sForceHwcCopy = false;
#endif #endif
#define VDS_LOGE(msg, ...) ALOGE("[%s] "msg, \ #define VDS_LOGE(msg, ...) ALOGE("[%s] " msg, \
mDisplayName.string(), ##__VA_ARGS__) mDisplayName.string(), ##__VA_ARGS__)
#define VDS_LOGW_IF(cond, msg, ...) ALOGW_IF(cond, "[%s] "msg, \ #define VDS_LOGW_IF(cond, msg, ...) ALOGW_IF(cond, "[%s] " msg, \
mDisplayName.string(), ##__VA_ARGS__) mDisplayName.string(), ##__VA_ARGS__)
#define VDS_LOGV(msg, ...) ALOGV("[%s] "msg, \ #define VDS_LOGV(msg, ...) ALOGV("[%s] " msg, \
mDisplayName.string(), ##__VA_ARGS__) mDisplayName.string(), ##__VA_ARGS__)
static const char* dbgCompositionTypeStr(DisplaySurface::CompositionType type) { static const char* dbgCompositionTypeStr(DisplaySurface::CompositionType type) {

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2380,8 +2380,8 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index,
colorizer.bold(result); colorizer.bold(result);
result.append("DispSync configuration: "); result.append("DispSync configuration: ");
colorizer.reset(result); colorizer.reset(result);
result.appendFormat("app phase %"PRId64" ns, sf phase %"PRId64" ns, " result.appendFormat("app phase %" PRId64 " ns, sf phase %" PRId64 " ns, "
"present offset %d ns (refresh %"PRId64" ns)", "present offset %d ns (refresh %" PRId64 " ns)",
vsyncPhaseOffsetNs, sfVsyncPhaseOffsetNs, PRESENT_TIME_OFFSET_FROM_VSYNC_NS, vsyncPhaseOffsetNs, sfVsyncPhaseOffsetNs, PRESENT_TIME_OFFSET_FROM_VSYNC_NS,
mHwc->getRefreshPeriod(HWC_DISPLAY_PRIMARY)); mHwc->getRefreshPeriod(HWC_DISPLAY_PRIMARY));
result.append("\n"); result.append("\n");
@ -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;