Snap for 4957529 from 9a1614b6a68a3e05e06995ca32c9e67ffb854297 to pi-qpr1-releaseandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release

Change-Id: I63a7d243c57e300aa07073fcddfe7fd62dda86b9

5 files changed, 11 insertions, 10 deletions

diff --git a/system/OpenglSystemCommon/ThreadInfo.cpp b/system/OpenglSystemCommon/ThreadInfo.cpp
index 9e11624d..425904ec 100644
--- a/system/OpenglSystemCommon/ThreadInfo.cpp
+++ b/system/OpenglSystemCommon/ThreadInfo.cpp
@@ -18,7 +18,9 @@
 
 thread_store_t s_tls = THREAD_STORE_INITIALIZER;
 
-static bool sDefaultTlsDestructorCallback(void* ptr) { return true; }
+static bool sDefaultTlsDestructorCallback(__attribute__((__unused__)) void* ptr) {
+  return true;
+}
 static bool (*sTlsDestructorCallback)(void*) = sDefaultTlsDestructorCallback;
 
 static void tlsDestruct(void *ptr)
diff --git a/system/OpenglSystemCommon/ThreadInfo.h b/system/OpenglSystemCommon/ThreadInfo.h
index 06d92677..57fd5ef1 100644
--- a/system/OpenglSystemCommon/ThreadInfo.h
+++ b/system/OpenglSystemCommon/ThreadInfo.h
@@ -21,7 +21,6 @@
 
 #include <bionic_tls.h>
 struct EGLContext_t;
-struct HostConnection;
 
 struct EGLThreadInfo
 {
diff --git a/system/OpenglSystemCommon/goldfish_dma.cpp b/system/OpenglSystemCommon/goldfish_dma.cpp
index 59adc833..046367df 100644
--- a/system/OpenglSystemCommon/goldfish_dma.cpp
+++ b/system/OpenglSystemCommon/goldfish_dma.cpp
@@ -53,7 +53,7 @@ int goldfish_dma_create_region(uint32_t sz, struct goldfish_dma_context* res) {
         }
 
         res->size = sz;
-        ALOGV("%s: successfully allocated goldfish DMA region with size %lu cxt=%p fd=%d",
+        ALOGV("%s: successfully allocated goldfish DMA region with size %u cxt=%p fd=%d",
               __FUNCTION__, sz, res, res->fd);
         return 0;
     } else {
@@ -66,7 +66,7 @@ int goldfish_dma_create_region(uint32_t sz, struct goldfish_dma_context* res) {
 void* goldfish_dma_map(struct goldfish_dma_context* cxt) {
     ALOGV("%s: on fd %d errno=%d", __FUNCTION__, cxt->fd, errno);
     void *mapped = mmap(0, cxt->size, PROT_WRITE, MAP_SHARED, cxt->fd, 0);
-    ALOGV("%s: cxt=%p mapped=%p size=%lu errno=%d",
+    ALOGV("%s: cxt=%p mapped=%p size=%u errno=%d",
         __FUNCTION__, cxt, mapped, cxt->size, errno);
 
     if (mapped == MAP_FAILED) {
@@ -88,13 +88,12 @@ int goldfish_dma_unmap(struct goldfish_dma_context* cxt) {
 void goldfish_dma_write(struct goldfish_dma_context* cxt,
                                const void* to_write,
                                uint32_t sz) {
-    ALOGV("%s: cxt=%p mapped=0x%08llx to_write=%p size=%lu",
-        __FUNCTION__, cxt, cxt->mapped_addr, to_write);
+    ALOGV("%s: cxt=%p mapped=0x%08llx to_write=%p size=%u",
+        __FUNCTION__, cxt, cxt->mapped_addr, to_write, sz);
     memcpy(reinterpret_cast<void *>(cxt->mapped_addr), to_write, sz);
 }
 
 void goldfish_dma_free(goldfish_dma_context* cxt) {
-    struct goldfish_dma_ioctl_info info;
     close(cxt->fd);
 }
 
diff --git a/system/OpenglSystemCommon/qemu_pipe.h b/system/OpenglSystemCommon/qemu_pipe.h
index 47387abf..52f4ee75 100644
--- a/system/OpenglSystemCommon/qemu_pipe.h
+++ b/system/OpenglSystemCommon/qemu_pipe.h
@@ -69,7 +69,7 @@ qemu_pipe_open(const char*  pipeName)
 {
     char  buff[256];
     int   buffLen;
-    int   fd, ret;
+    int   fd;
 
     if (pipeName == NULL || pipeName[0] == '\0') {
         errno = EINVAL;
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index 64807364..e52c5bd6 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -818,9 +818,10 @@ static const char *getGLString(int glEnum)
 
 // ----------------------------------------------------------------------------
 
+// Note: C99 syntax was tried here but does not work for all compilers.
 static EGLClient_eglInterface s_eglIface = {
-    .getThreadInfo = getEGLThreadInfo,
-    .getGLString = getGLString,
+    getThreadInfo: getEGLThreadInfo,
+    getGLString: getGLString,
 };
 
 #define DBG_FUNC DBG("%s\n", __FUNCTION__)