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

Commit 2a4f0ff3 authored by Colin Cross's avatar Colin Cross
Browse files

build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set 

If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.

Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.

Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
parent a3339e98

core/config.mk

+20 −10
Original line number Diff line number Diff line
@@ -236,12 +236,8 @@ TARGET_PREFER_32_BIT_APPS := true 
TARGET_PREFER_32_BIT_EXECUTABLES := true

endif



# "ro.product.cpu.abilist" is a comma separated list of ABIs (in order

# of preference) that the target supports. If a TARGET_CPU_ABI_LIST

# is specified by the board configuration, we use that. If not, we

# build a list out of the TARGET_CPU_ABIs specified by the config.

ifeq (,$(TARGET_CPU_ABI_LIST))

  TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)

ifeq (,$(TARGET_SUPPORTS_32_BIT_APPS)$(TARGET_SUPPORTS_64_BIT_APPS))

  TARGET_SUPPORTS_32_BIT_APPS := true

endif



# "ro.product.cpu.abilist32" and "ro.product.cpu.abilist64" are
@@ -254,7 +250,7 @@ endif 
# is always 32 bits. If this isn't the case, these variables should

# be overriden in the boarc configuration.

ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT))

  ifeq (true,$(TARGET_IS_64_BIT))

  ifeq (true|true,$(TARGET_IS_64_BIT)|$(TARGET_SUPPORTS_64_BIT_APPS))

    TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)

  endif

endif
@@ -263,11 +259,25 @@ ifeq (,$(TARGET_CPU_ABI_LIST_32_BIT)) 
  ifneq (true,$(TARGET_IS_64_BIT))

    TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)

  else

    ifeq (true,$(TARGET_SUPPORTS_32_BIT_APPS))

      # For a 64 bit target, assume that the 2ND_CPU_ABI

      # is a 32 bit ABI.

      TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)

    endif

  endif

endif



# "ro.product.cpu.abilist" is a comma separated list of ABIs (in order

# of preference) that the target supports. If a TARGET_CPU_ABI_LIST

# is specified by the board configuration, we use that. If not, we

# build a list out of the TARGET_CPU_ABIs specified by the config.

ifeq (,$(TARGET_CPU_ABI_LIST))

  ifeq ($(TARGET_IS_64_BIT)|$(TARGET_PREFER_32_BIT_APPS),true|true)

    TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_32_BIT) $(TARGET_CPU_ABI_LIST_64_BIT)

  else

    TARGET_CPU_ABI_LIST := $(TARGET_CPU_ABI_LIST_64_BIT) $(TARGET_CPU_ABI_LIST_32_BIT)

  endif

endif



# Strip whitespace from the ABI list string.

TARGET_CPU_ABI_LIST := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST)))