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

Commit 9d99d7df authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

resolved conflicts for merge of 6da54b6e to master 

Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
parents d7d096df 6da54b6e

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,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
@@ -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

target/board/generic_x86/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -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