diff options
| author | Yahan Zhou <yahan@google.com> | 2016-10-17 15:06:09 -0700 |
|---|---|---|
| committer | Yahan Zhou <yahan@google.com> | 2016-10-18 18:58:13 +0000 |
| commit | 3855dfbf428269d3c79dd7ba4b257ec5e9b917ff (patch) | |
| tree | fb956ec409e1aa16f2427500d1f0f895bc395d46 | |
| parent | b135d6eeb01debbd7c4cac02972af7c91228e90c (diff) | |
| download | goldfish-opengl-nougat-mr1.8-release.tar.gz | |
Fix the position of qemu_pipe headerandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-dev
In the master branch, qemu_pipe.h is in system folder. But in nyc-mr1,
it is in hardware folder.
BUG:32183368
Change-Id: Ic858d4f93280499896f9ff592459c2f4610a27df
| -rw-r--r-- | system/OpenglSystemCommon/ProcessPipe.cpp | 4 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/QemuPipeStream.cpp | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp index e6382362..b13487b9 100644 --- a/system/OpenglSystemCommon/ProcessPipe.cpp +++ b/system/OpenglSystemCommon/ProcessPipe.cpp @@ -18,11 +18,7 @@ #include <cutils/log.h> #include <pthread.h> -#if PLATFORM_SDK_VERSION > 24 -#include <system/qemu_pipe.h> -#else // PLATFORM_SDK_VERSION #include <hardware/qemu_pipe.h> -#endif //PLATFORM_SDK_VERSION static int sProcPipe = 0; static pthread_once_t sProcPipeOnce = PTHREAD_ONCE_INIT; diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp index de9f3afb..3804097a 100644 --- a/system/OpenglSystemCommon/QemuPipeStream.cpp +++ b/system/OpenglSystemCommon/QemuPipeStream.cpp @@ -14,11 +14,7 @@ * limitations under the License. */ #include "QemuPipeStream.h" -#if PLATFORM_SDK_VERSION > 24 -#include <system/qemu_pipe.h> -#else // PLATFORM_SDK_VERSION #include <hardware/qemu_pipe.h> -#endif //PLATFORM_SDK_VERSION #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -55,11 +51,7 @@ QemuPipeStream::~QemuPipeStream() int QemuPipeStream::connect(void) { -#if PLATFORM_SDK_VERSION > 24 - m_sock = qemu_pipe_open("pipe:opengles"); -#else // PLATFORM_SDK_VERSION m_sock = qemu_pipe_open("opengles"); -#endif // PLATFORM_SDK_VERSION if (!valid()) return -1; return 0; } |