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

Commit ecc70d70 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Define TARGET_CPU_ABI for finding native code in .apks

parent f326d143

core/Makefile

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

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

	        bash $(BUILDINFO_SH) > $@

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

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

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -406,6 +406,10 @@ board_config_mk := 


# Clean up/verify variables defined by the board config file.

TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME))

TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI))

ifeq ($(TARGET_CPU_ABI),)

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

endif



#

# Include all of the makefiles in the system

target/board/generic/BoardConfig.mk

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 
TARGET_NO_BOOTLOADER := true

TARGET_NO_KERNEL := true

TARGET_NO_RADIOIMAGE := true

TARGET_CPU_ABI := armeabi

HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true

target/board/sim/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ TARGET_NO_BOOTLOADER := true 
# Don't bother with a kernel

TARGET_NO_KERNEL := true



# The simulator does not support native code at all

TARGET_CPU_ABI := none



#the simulator partially emulates the original HTC /dev/eac audio interface

HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true

tools/buildinfo.sh

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ echo "ro.product.brand=$PRODUCT_BRAND" 
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"

echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER"

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

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