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

Commit 8af7e8ed authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp 

Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
parents 049808e3 1852237a

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# Add ro.product.cpu.abilist{32,64} to build.prop.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,8 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \

			TARGET_CPU_ABI_LIST_32_BIT="$(TARGET_CPU_ABI_LIST_32_BIT)" \

			TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

core/config.mk

+38 −0
Original line number Diff line number Diff line
@@ -231,6 +231,44 @@ combo_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) 
include $(BUILD_SYSTEM)/combo/select.mk

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)

endif



# "ro.product.cpu.abilist32" and "ro.product.cpu.abilist64" are

# comma separated lists of the 32 and 64 bit ABIs (in order of

# preference) that the target supports. If TARGET_CPU_ABI_LIST_{32,64}_BIT

# are defined by the board config, we use them. Else, we construct

# these lists based on whether TARGET_IS_64_BIT is set.

#

# Note that this assumes that the 2ND_CPU_ABI for a 64 bit target

# 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))

    TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)

  endif

endif



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

    # 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



# Strip whitespace from the ABI list string.

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

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

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



# Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX

# if only TARGET_TOOLS_PREFIX is passed to the make command.

ifndef TARGET_TOOLCHAIN_ROOT

core/envsetup.mk

+0 −22
Original line number Diff line number Diff line
@@ -143,28 +143,6 @@ endif 
TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))

board_config_mk :=



# "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)

  ifneq (,$(TARGET_CPU_ABI2))

    TARGET_CPU_ABI_LIST += ,$(TARGET_CPU_ABI2)

  endif

  ifneq (,$(TARGET_2ND_CPU_ABI))

    TARGET_CPU_ABI_LIST += ,$(TARGET_2ND_CPU_ABI)

  endif

  ifneq (,$(TARGET_2ND_CPU_ABI2))

    TARGET_CPU_ABI_LIST += ,$(TARGET_2ND_CPU_ABI2)

  endif



  # Strip whitespace from the ABI list string.

  empty :=

  space := $(empty) $(empty)

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

endif



# ---------------------------------------------------------------

# Set up configuration for target machine.

# The following must be set:

tools/buildinfo.sh

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ if [ -n "$TARGET_CPU_ABI2" ] ; then 
  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"

fi

echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"

echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"

echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"



echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

if [ -n "$PRODUCT_DEFAULT_LANGUAGE" ] ; then