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

Commit 31597999 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I2edfb71d into eclair 

* changes:
  Support secondary CPU ABI in build.prop
parents f17e6387 2edfb71d

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) 
			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \

	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI)) 
ifeq ($(TARGET_CPU_ABI),)

  $(error No TARGET_CPU_ABI defined by board config: $(board_config_mk))

endif

TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))



# $(1): os/arch

define select-android-config-h

tools/buildinfo.sh

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ echo "ro.product.name=$PRODUCT_NAME" 
echo "ro.product.device=$TARGET_DEVICE"

echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME"

echo "ro.product.cpu.abi=$TARGET_CPU_ABI"

if [ -n "$TARGET_CPU_ABI2" ] ; then

  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"

fi

echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

echo "ro.product.locale.language=$PRODUCT_DEFAULT_LANGUAGE"

echo "ro.product.locale.region=$PRODUCT_DEFAULT_REGION"