StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp

Browse Source 
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
This commit is contained in:
David 'Digit' Turner
2011-08-25 23:23:32 +02:00
parent 2bcdfe145d 7be88d00bb
commit 6da54b6e0e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@@ -399,6 +399,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/clang \ external/clang \
external/easymock \ external/easymock \
external/expat \ external/expat \

3
target/board/generic/BoardConfig.mk
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

3
target/board/generic_x86/BoardConfig.mk
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