Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6da54b6e authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

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

Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
parents 2bcdfe14 7be88d00

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ subdirs := \ 
	development/host \

	development/tools/etc1tool \

	development/tools/line_endings \

	development/tools/emulator/opengl \

	external/clang \

	external/easymock \

	external/expat \

target/board/generic/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -36,3 +36,6 @@ TARGET_SHELL := mksh 
ifeq ($(HOST_OS),linux)

WITH_DEXPREOPT := true

endif



# Build OpenGLES emulation guest and host libraries

BUILD_EMULATOR_OPENGL := true

target/board/generic_x86/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -26,3 +26,6 @@ TARGET_SHELL := mksh 
ifeq ($(HOST_OS),linux)

WITH_DEXPREOPT := true

endif



# Build OpenGLES emulation host and guest libraries

BUILD_EMULATOR_OPENGL := true