diff options
author | Mathias Agopian <mathias@google.com> | 2009-04-17 13:11:48 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-04-17 13:11:48 -0700 |
commit | 13b3b5c9b2594fe2a42e479ae4f3f733fce911dc (patch) | |
tree | 06fe3332007b70fd7555f1e7f3c51de188b66717 /core/jni/Android.mk | |
parent | 69d62097e8195c947de7e4cdc4a491181aa56e61 (diff) | |
parent | cec478a162f027ea4727ccbe10c1297acd4342f0 (diff) | |
download | frameworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.zip frameworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.tar.gz frameworks_base-13b3b5c9b2594fe2a42e479ae4f3f733fce911dc.tar.bz2 |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 766febd..c31acea 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -23,6 +23,10 @@ LOCAL_SRC_FILES:= \ CursorWindow.cpp \ com_google_android_gles_jni_EGLImpl.cpp \ com_google_android_gles_jni_GLImpl.cpp.arm \ + android_opengl_GLES10.cpp \ + android_opengl_GLES10Ext.cpp \ + android_opengl_GLES11.cpp \ + android_opengl_GLES11Ext.cpp \ android_database_CursorWindow.cpp \ android_database_SQLiteDebug.cpp \ android_database_SQLiteDatabase.cpp \ |