p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 6da54b6e to master 

Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
This commit is contained in:
David 'Digit' Turner 2011-08-26 00:53:34 +02:00
parent d7d096df71 6da54b6e0e
commit 9d99d7dfb8
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

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

3
target/board/generic/BoardConfig.mk
View File

@ -30,3 +30,6 @@ USE_CAMERA_STUB := true
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
TARGET_SHELL := ash
# Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true

3
target/board/generic_x86/BoardConfig.mk
View File

@ -20,3 +20,6 @@ USE_CAMERA_STUB := true
# Set /system/bin/sh to ash, not mksh, to make sure we can switch back.
TARGET_SHELL := ash
# Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true