From f6e2694dd24d54a93d3c9adb633e0776cedb1049 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 9 May 2014 15:19:45 +0200 Subject: [PATCH] Disable emulator from platform builds. Now that emulator prebuilts are available under prebuilts/android-emulator/, disable building the emulator from source in all platform builds, except if one defines BUILD_EMULATOR to 'true' in its environment. NOTE: This patch should be applied after this one to avoid issues with the GPU emulation libraries: https://android-review.googlesource.com/93980 Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42 --- core/main.mk | 16 +--------------- target/board/generic_arm64/BoardConfig.mk | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/core/main.mk b/core/main.mk index 8f60da751a..e7a97be444 100644 --- a/core/main.mk +++ b/core/main.mk @@ -228,22 +228,8 @@ endif ifndef BUILD_EMULATOR -ifeq (darwin,$(HOST_OS)) -GCC_REALPATH = $(realpath $(shell which $(HOST_CC))) -ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),) - # Using LLVM GCC results in a non functional emulator due to it - # not honouring global register variables - $(warning ****************************************) - $(warning * gcc is linked to llvm-gcc which will *) - $(warning * not create a useable emulator. *) - $(warning ****************************************) + # Emulator binaries are now provided under prebuilts/android-emulator/ BUILD_EMULATOR := false -else - BUILD_EMULATOR := true -endif -else # HOST_OS is not darwin - BUILD_EMULATOR := true -endif # HOST_OS is darwin endif $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 1768ffc9b6..9d3bcc035c 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -55,4 +55,3 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -BUILD_EMULATOR := false