commit 9076fa78d2541fa14253aaf08e6445fafa17e35b
author Narayan Kamath <narayan@google.com> Fri Feb 21 14:27:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 21 14:27:36 2014 +0000
tree 9da937a0dcd52b90016326b709aeb3c30da4b25d
parent f56ae1999948393ba8c207525d6466ee424c4467
parent 8e472fb4430c44f7d5b3f5c85a96516cfb762f88

Merge "Update EGL codegen to be in sync with frameworks/base"

opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp

diff --git a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
index cc10336..4743038 100644
--- a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
+++ b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp
@@ -182,7 +182,7 @@
             if (array) {
                 releasePointer(_env, array, buf, 0);
             }
-            buf = buf + offset;
+            buf = (char*)buf + offset;
         } else {
             jniThrowException(_env, "java/lang/IllegalArgumentException",
                               "Must use a native order direct Buffer");

services/surfaceflinger/Android.mk

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index b2bc550..49a017f 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -120,6 +120,10 @@
 
 LOCAL_MODULE:= surfaceflinger
 
+ifdef TARGET_32_BIT_SURFACEFLINGER
+LOCAL_32_BIT_ONLY := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 ###############################################################