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

am fb67f05d: Merge changes I53b2ada9,I30794ea5

Browse Source 
* commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
This commit is contained in:
David 'Digit' Turner
2014-05-11 09:19:43 +00:00
committed by Android Git Automerger
parent c581e10a2b fb67f05d3d
commit 9e3259f50d
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/main.mk
View File

@@ -228,22 +228,8 @@ endif
ifndef BUILD_EMULATOR ifndef BUILD_EMULATOR
ifeq (darwin,$(HOST_OS)) # Emulator binaries are now provided under prebuilts/android-emulator/
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 ****************************************)
BUILD_EMULATOR := false BUILD_EMULATOR := false
else
BUILD_EMULATOR := true
endif
else # HOST_OS is not darwin
BUILD_EMULATOR := true
endif # HOST_OS is darwin
endif endif
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \

19
envsetup.sh
View File

@@ -171,6 +171,25 @@ function setpaths()
export ANDROID_QTOOLS=$T/development/emulator/qtools export ANDROID_QTOOLS=$T/development/emulator/qtools
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS: export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
# to ensure that the corresponding 'emulator' binaries are used.
case $(uname -s) in
Darwin)
ANDROID_EMULATOR_PREBUILTS=$T/prebuilts/android-emulator/darwin-x86_64
;;
Linux)
ANDROID_EMULATOR_PREBUILTS=$T/prebuilts/android-emulator/linux-x86_64
;;
*)
ANDROID_EMULATOR_PREBUILTS=
;;
esac
if [ -n "$ANDROID_EMULATOR_PREBUILTS" -a -d "$ANDROID_EMULATOR_PREBUILTS" ]; then
ANDROID_BUILD_PATHS=$ANDROID_EMULATOR_PREBUILTS:$ANDROID_BUILD_PATHS
export ANDROID_EMULATOR_PREBUILTS
fi
export PATH=$ANDROID_BUILD_PATHS$PATH export PATH=$ANDROID_BUILD_PATHS$PATH
unset ANDROID_JAVA_TOOLCHAIN unset ANDROID_JAVA_TOOLCHAIN

1
target/board/generic_arm64/BoardConfig.mk
View File

@@ -55,4 +55,3 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 512 BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BUILD_EMULATOR := false