diff options
author | David 'Digit' Turner <digit@android.com> | 2011-08-25 12:14:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-25 12:14:33 -0700 |
commit | 7be88d00bb26d163b1432ea9a04e07998c26133c (patch) | |
tree | 555dd9abe56f7b02b4c183b57ea8ff9e692035a6 /core | |
parent | 4651ee5db200772921bad828c280d165ff3997c3 (diff) | |
parent | 77c6261fb074d87b75d669dd9fb9ab5a12a52cc9 (diff) | |
download | build-7be88d00bb26d163b1432ea9a04e07998c26133c.zip build-7be88d00bb26d163b1432ea9a04e07998c26133c.tar.gz build-7be88d00bb26d163b1432ea9a04e07998c26133c.tar.bz2 |
am 77c6261f: Merge "emulator: Enable GLES emulation libraries"
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
Diffstat (limited to 'core')
-rw-r--r-- | core/main.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index b4282ee..7f37f0e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -390,6 +390,7 @@ subdirs := \ development/host \ development/tools/etc1tool \ development/tools/line_endings \ + development/tools/emulator/opengl \ external/easymock \ external/expat \ external/libpng \ |