Merge "opengl: Regenerate code with ES 3.1 and new extensions"
diff --git a/data/etc/android.software.webview.xml b/data/etc/android.software.webview.xml
new file mode 100644
index 0000000..d843209
--- /dev/null
+++ b/data/etc/android.software.webview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<permissions>
+ <feature name="android.software.webview" />
+</permissions>
diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index a2f01a4..da7302d 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -269,6 +269,11 @@
AKEYCODE_SLEEP = 223,
AKEYCODE_WAKEUP = 224,
AKEYCODE_PAIRING = 225,
+ AKEYCODE_MEDIA_TOP_MENU = 226,
+ AKEYCODE_11 = 227,
+ AKEYCODE_12 = 228,
+ AKEYCODE_LAST_CHANNEL = 229,
+ AKEYCODE_TV_DATA_SERVICE = 230
// NOTE: If you add a new keycode here you must also add it to several other files.
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index 36be4fc..47b23cb 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -265,6 +265,11 @@
DEFINE_KEYCODE(SLEEP),
DEFINE_KEYCODE(WAKEUP),
DEFINE_KEYCODE(PAIRING),
+ DEFINE_KEYCODE(MEDIA_TOP_MENU),
+ DEFINE_KEYCODE(11),
+ DEFINE_KEYCODE(12),
+ DEFINE_KEYCODE(LAST_CHANNEL),
+ DEFINE_KEYCODE(TV_DATA_SERVICE),
{ NULL, 0 }
};
diff --git a/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if
index 146d883..648fa82 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES10ExtHeader.java-if
@@ -22,6 +22,6 @@
public class GLES10Ext {
native private static void _nativeClassInit();
static {
- _nativeClassInit();
+ _nativeClassInit();
}
\ No newline at end of file
diff --git a/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if b/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if
index 16cab04..baabbed 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES10Header.java-if
@@ -262,7 +262,7 @@
native private static void _nativeClassInit();
static {
- _nativeClassInit();
+ _nativeClassInit();
}
private static Buffer _colorPointer;
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
index efaf867..233562e 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES11ExtHeader.java-if
@@ -132,7 +132,7 @@
native private static void _nativeClassInit();
static {
- _nativeClassInit();
+ _nativeClassInit();
}
private static final int GL_BYTE = GLES10.GL_BYTE;
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if b/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if
index e63d470..2b3e40e 100644
--- a/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if
+++ b/opengl/tools/glgen/stubs/gles11/GLES11Header.java-if
@@ -147,7 +147,7 @@
native private static void _nativeClassInit();
static {
- _nativeClassInit();
+ _nativeClassInit();
}
private static Buffer _pointSizePointerOES;
diff --git a/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java
index 719429b..7780e23 100644
--- a/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java
+++ b/opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java
@@ -1,11 +1,11 @@
- // C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
+ // C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
- public static native void glGetUniformIndices(
+ public static native void glGetUniformIndices(
int program,
String[] uniformNames,
int[] uniformIndices,
int uniformIndicesOffset
- );
+ );
// C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
diff --git a/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java b/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java
index c824344..b63a11d 100644
--- a/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java
+++ b/opengl/tools/glgen/stubs/gles11/glTransformFeedbackVaryings.java
@@ -1,8 +1,8 @@
- // C function void glTransformFeedbackVaryings ( GLuint program, GLsizei count, const GLchar *varyings, GLenum bufferMode )
+ // C function void glTransformFeedbackVaryings ( GLuint program, GLsizei count, const GLchar *varyings, GLenum bufferMode )
- public static native void glTransformFeedbackVaryings(
+ public static native void glTransformFeedbackVaryings(
int program,
String[] varyings,
int bufferMode
- );
+ );
diff --git a/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl b/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl
index 9740235..afcc3eb 100644
--- a/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl
+++ b/opengl/tools/glgen/stubs/jsr239/GLImplHeader.java-impl
@@ -38,7 +38,7 @@
native private static void _nativeClassInit();
static {
- _nativeClassInit();
+ _nativeClassInit();
}
Buffer _colorPointer = null;