Revert "Fix git-master and sync device"

This reverts commit 057e300788707fca96aeb82c3cc4d1d9b475b032.

Change-Id: Ic2d2c808cf1587e839abfa7a8928792544f231ac

diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index b083e3e..36cbced 100644 (file)
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -226,7 +226,7 @@ void HostConnection::setChecksumHelper(ExtendedRCEncoderContext *rcEnc) {
 
 void HostConnection::queryAndSetSyncImpl(ExtendedRCEncoderContext *rcEnc) {
     const std::string& glExtensions = queryGLExtensions(rcEnc);
-#if PLATFORM_SDK_VERSION <= 16 || PLATFORM_SDK_VERSION >= 25 || ((!defined(__i386__) && !defined(__x86_64__)))
+#if PLATFORM_SDK_VERSION <= 16 || (!defined(__i386__) && !defined(__x86_64__))
     rcEnc->setSyncImpl(SYNC_IMPL_NONE);
 #else
     if (glExtensions.find(kRCNativeSync) != std::string::npos) {
@@ -239,7 +239,7 @@ void HostConnection::queryAndSetSyncImpl(ExtendedRCEncoderContext *rcEnc) {
 
 void HostConnection::queryAndSetDmaImpl(ExtendedRCEncoderContext *rcEnc) {
     std::string glExtensions = queryGLExtensions(rcEnc);
-#if PLATFORM_SDK_VERSION <= 16 || PLATFORM_SDK_VERSION >= 25 || ((!defined(__i386__) && !defined(__x86_64__)))
+#if PLATFORM_SDK_VERSION <= 16 || PLATFORM_SDK_VERSION >= 25 || (!defined(__i386__) && !defined(__x86_64__))
     rcEnc->setDmaImpl(DMA_IMPL_NONE);
 #else
     if (glExtensions.find(kDmaExtStr_v1) != std::string::npos) {