emulator/opengl: Backport fixes from master branch.

This back-ports several fixes from aosp/master branch into idea133:

  145e25 Fix the Google Maps crash issue
  e33909 Support GL_MAX_TEXTURE_SIZE case to glGetIntegerv API
  c6dd20 Fix Mac build.

Change-Id: I26a05956c3b926dddeb638c6cff979199075ecbb

2 files changed, 4 insertions, 4 deletions

diff --git a/emulator/opengl/host/tools/emugen/getopt.c b/emulator/opengl/host/tools/emugen/getopt.c
index 0ac02d8..3523538 100644
--- a/emulator/opengl/host/tools/emugen/getopt.c
+++ b/emulator/opengl/host/tools/emugen/getopt.c
@@ -8,7 +8,7 @@
 int opterr = 1;
 int optind = 1;
 int optopt = 0;
-const char* optarg;
+char* optarg;
 
 int getopt(int argc, char* const argv[], const char* ostr) {
     static const char kEmpty[] = "";
@@ -57,9 +57,9 @@ int getopt(int argc, char* const argv[], const char* ostr) {
     // This option needs an argument. Either after the option character,
     // or the argument that follows.
     if (*place) {
-        optarg = place;
+        optarg = (char *)place;
     } else if (argc > ++optind) {
-        optarg = argv[optind];
+        optarg = (char *)argv[optind];
     } else if (oindex[2] == ':') {
         // Optional argument is missing.
         place = kEmpty;
diff --git a/emulator/opengl/host/tools/emugen/getopt.h b/emulator/opengl/host/tools/emugen/getopt.h
index 5ad039c..cc04850 100644
--- a/emulator/opengl/host/tools/emugen/getopt.h
+++ b/emulator/opengl/host/tools/emugen/getopt.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 extern int optind;
-extern const char* optarg;
+extern char* optarg;
 extern int optopt;
 
 int getopt(int argc, char* const argv[], const char* ostr);