am 77c6261f: Merge "emulator: Enable GLES emulation libraries"

* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
  emulator: Enable GLES emulation libraries
This commit is contained in:
David 'Digit' Turner 2011-08-25 12:14:33 -07:00 committed by Android Git Automerger
commit 7be88d00bb
3 changed files with 7 additions and 0 deletions

View File

@ -390,6 +390,7 @@ subdirs := \
development/host \ development/host \
development/tools/etc1tool \ development/tools/etc1tool \
development/tools/line_endings \ development/tools/line_endings \
development/tools/emulator/opengl \
external/easymock \ external/easymock \
external/expat \ external/expat \
external/libpng \ external/libpng \

View File

@ -36,3 +36,6 @@ TARGET_SHELL := mksh
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
# Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true

View File

@ -26,3 +26,6 @@ TARGET_SHELL := mksh
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
# Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true