From c26879632b8ed3e91c7e5e9e9650d2412835e849 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Thu, 27 Feb 2014 17:41:57 +0100
Subject: emulator/opengl: Remove <utils/List.h> + <utils/String8.h>

This removes dependencies on two libutils headers.

Rather than provide alternative data types, simply disable the
corresponding code because it looks like the corresponding fields
are simply never used by the code?

It is likely that this code is only used in the guest portion
of the code, and thus completely un-necessary on the host side.

Change-Id: I22c67f114c2c77381ceba8de23dd631158276596
---
 emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp | 4 ++++
 emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.h   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'emulator')

diff --git a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp
index f317259..db7f418 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp
+++ b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp
@@ -16,6 +16,8 @@
 
 #include "GLSharedGroup.h"
 
+#include <string.h>
+
 /**** BufferData ****/
 
 BufferData::BufferData() : m_size(0) {};
@@ -325,6 +327,7 @@ void GLSharedGroup::setProgramIndexInfo(GLuint program,
             GLuint shaderId = pData->getShader(i);
             ShaderData* shader = m_shaders.get(shaderId);
             if (!shader) continue;
+#if 0  // TODO(digit): Understand why samplerExternalNames is always empty?
             ShaderData::StringList::iterator nameIter =
                     shader->samplerExternalNames.begin();
             ShaderData::StringList::iterator nameEnd  =
@@ -338,6 +341,7 @@ void GLSharedGroup::setProgramIndexInfo(GLuint program,
                 }
                 ++nameIter;
             }
+#endif
         }
     }
 }
diff --git a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.h b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.h
index 0daa3a8..f111f99 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.h
@@ -35,8 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "ErrorLog.h"
-#include <utils/List.h>
-#include <utils/String8.h>
 #include "FixedBuffer.h"
 
 struct BufferData {
@@ -94,8 +92,10 @@ public:
 };
 
 struct ShaderData {
+#if 0  // TODO(digit): Undertand why this is never used?
     typedef android::List<android::String8> StringList;
     StringList samplerExternalNames;
+#endif
     int refcount;
 };
 
-- 
cgit v1.1