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

Commit d5227a83 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "build: rename aarch64 target to arm64"

parents 51c47855 4f0eb7d5

core/combo/TARGET_linux-aarch64.mk→core/combo/TARGET_linux-arm64.mk

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 
TARGET_GLOBAL_CFLAGS += \

    -fno-strict-aliasing \



android_config_h := $(call select-android-config-h,linux-aarch64)

android_config_h := $(call select-android-config-h,linux-arm64)



TARGET_GLOBAL_CFLAGS += \

			-fpic -fPIE \
@@ -138,12 +138,12 @@ KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) 
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)



TARGET_C_INCLUDES := \

	$(libc_root)/arch-aarch64/include \

	$(libc_root)/arch-arm64/include \

	$(libc_root)/include \

	$(libstdc++_root)/include \

	$(KERNEL_HEADERS) \

	$(libm_root)/include \

	$(libm_root)/include/aarch64 \

	$(libm_root)/include/arm64 \

	$(libthread_db_root)/include



TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o

envsetup.sh

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ function setpaths() 
            ;;

        arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin

            ;;

        aarch64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin

        arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin

            ;;

        mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin

            ;;
@@ -436,7 +436,7 @@ add_lunch_combo aosp_arm-eng 
add_lunch_combo aosp_x86-eng

add_lunch_combo aosp_mips-eng

add_lunch_combo aosp_x86_64-eng

add_lunch_combo aosp_aarch64-eng

add_lunch_combo aosp_arm64-eng

add_lunch_combo vbox_x86-eng



function print_lunch_menu()

target/board/generic_aarch64/BoardConfig.mk→target/board/generic_arm64/BoardConfig.mk

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
# The generic product target doesn't have any hardware-specific pieces.

TARGET_NO_BOOTLOADER := true

TARGET_NO_KERNEL := true

TARGET_ARCH := aarch64

TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := aarch64-v8a

TARGET_CPU_ABI := arm64-v8a



# no hardware camera

USE_CAMERA_STUB := true
@@ -48,6 +48,6 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true



# FIXME

# Temporarily disable linking against compiler_rt until there is an aarch64

# Temporarily disable linking against compiler_rt until there is an arm64

# version

WITHOUT_LIBCOMPILER_RT := true