OSDN Git Service

Merge "Revert "Fix boot for car emulator on git-master""
authorLingfeng Yang <lfy@google.com>
Wed, 11 Jan 2017 00:30:58 +0000 (00:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2017 00:30:59 +0000 (00:30 +0000)
system/OpenglSystemCommon/HostConnection.cpp

index 36cbced..bb03457 100644 (file)
@@ -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 || (!defined(__i386__) && !defined(__x86_64__))
     rcEnc->setDmaImpl(DMA_IMPL_NONE);
 #else
     if (glExtensions.find(kDmaExtStr_v1) != std::string::npos) {