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

Commit 7ba7d7f4 authored by Ying Wang's avatar Ying Wang
Browse files

Default host module to 64-bit except for SDK builds. 

Set "HOST_PREFER_32_BIT := true" only if "sdk" or "win_sdk" is among the
make command line goals, or it's a MinGW windows build, which only builds
host SDK tools.

Bug: 13751317
Change-Id: I8ec1a97a5d1af065a153b16523c2ee3434d0dd71
parent ec8778e8

core/envsetup.mk

+11 −13
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ ifeq ($(HOST_OS),) 
$(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)

endif



# TODO: Replace BUILD_HOST_64bit with a flag that forces 32-bit build,

# after we default to 64-bit host build.

ifeq (,$(BUILD_HOST_64bit))

# Default to 32-bit-by-default multilib host build.

HOST_PREFER_32_BIT := true

endif



# HOST_ARCH

ifneq (,$(findstring x86_64,$(UNAME)))

  HOST_ARCH := x86_64
@@ -81,12 +74,6 @@ ifneq (,$(findstring x86_64,$(UNAME))) 
  HOST_IS_64_BIT := true

endif



ifeq ($(HOST_PREFER_32_BIT),true)

SDK_HOST_ARCH := x86

else

SDK_HOST_ARCH := $(HOST_ARCH)

endif



BUILD_ARCH := $(HOST_ARCH)

BUILD_2ND_ARCH := $(HOST_2ND_ARCH)
@@ -133,6 +120,17 @@ $(warning bad TARGET_BUILD_VARIANT: $(TARGET_BUILD_VARIANT)) 
$(error must be empty or one of: eng user userdebug)

endif



# Build host as 32-bit for SDK build.

ifneq ($(filter $(MAKECMDGOALS),win_sdk sdk),)

HOST_PREFER_32_BIT := true

endif

ifdef USE_MINGW

# We only build sdk host tools in the MinGW windows build.

# Build it as 32-bit as well.

HOST_PREFER_32_BIT := true

endif

SDK_HOST_ARCH := x86



# Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)

# or under vendor/*/$(TARGET_DEVICE).  Search in both places, but

# make sure only one exists.