build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-arm64.mk
similarity index 97%
rename from core/combo/TARGET_linux-aarch64.mk
rename to core/combo/TARGET_linux-arm64.mk
index 50996eb..c07a096 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -76,7 +76,7 @@
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 := $(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
diff --git a/core/combo/arch/aarch64/armv8-a.mk b/core/combo/arch/arm64/armv8-a.mk
similarity index 100%
rename from core/combo/arch/aarch64/armv8-a.mk
rename to core/combo/arch/arm64/armv8-a.mk
diff --git a/core/combo/include/arch/linux-aarch64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h
similarity index 100%
rename from core/combo/include/arch/linux-aarch64/AndroidConfig.h
rename to core/combo/include/arch/linux-arm64/AndroidConfig.h
diff --git a/envsetup.sh b/envsetup.sh
index 13cc6f7..3ec6cce 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -132,7 +132,7 @@
;;
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_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()
diff --git a/target/board/generic_aarch64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
similarity index 96%
rename from target/board/generic_aarch64/BoardConfig.mk
rename to target/board/generic_arm64/BoardConfig.mk
index b4dfa97..03284d7 100644
--- a/target/board/generic_aarch64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -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 @@
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
diff --git a/target/board/generic_aarch64/README.txt b/target/board/generic_arm64/README.txt
similarity index 61%
rename from target/board/generic_aarch64/README.txt
rename to target/board/generic_arm64/README.txt
index 681c31e..21c71d7 100644
--- a/target/board/generic_aarch64/README.txt
+++ b/target/board/generic_arm64/README.txt
@@ -1,4 +1,4 @@
-The "generic_aarch64" product defines a non-hardware-specific aarch64 target
+The "generic_arm64" product defines a non-hardware-specific arm64 target
without a kernel or bootloader.
It is not a product "base class"; no other products inherit
diff --git a/target/board/generic_aarch64/device.mk b/target/board/generic_arm64/device.mk
similarity index 100%
rename from target/board/generic_aarch64/device.mk
rename to target/board/generic_arm64/device.mk
diff --git a/target/board/generic_aarch64/system.prop b/target/board/generic_arm64/system.prop
similarity index 66%
rename from target/board/generic_aarch64/system.prop
rename to target/board/generic_arm64/system.prop
index 29e4be9..aee6b13 100644
--- a/target/board/generic_aarch64/system.prop
+++ b/target/board/generic_arm64/system.prop
@@ -1,5 +1,5 @@
#
-# system.prop for generic aarch64 sdk
+# system.prop for generic arm64 sdk
#
rild.libpath=/system/lib/libreference-ril.so
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index e3298a9..65adb0c 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -41,7 +41,7 @@
$(LOCAL_DIR)/full_x86.mk \
$(LOCAL_DIR)/aosp_mips.mk \
$(LOCAL_DIR)/full_mips.mk \
- $(LOCAL_DIR)/aosp_aarch64.mk
+ $(LOCAL_DIR)/aosp_arm64.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
@@ -54,7 +54,7 @@
$(LOCAL_DIR)/full_x86.mk \
$(LOCAL_DIR)/aosp_mips.mk \
$(LOCAL_DIR)/full_mips.mk \
- $(LOCAL_DIR)/aosp_aarch64.mk \
+ $(LOCAL_DIR)/aosp_arm64.mk \
$(LOCAL_DIR)/aosp_x86_64.mk \
$(LOCAL_DIR)/full_x86_64.mk \
$(LOCAL_DIR)/vbox_x86.mk \
diff --git a/target/product/aosp_aarch64.mk b/target/product/aosp_arm64.mk
similarity index 84%
rename from target/product/aosp_aarch64.mk
rename to target/product/aosp_arm64.mk
index 67b7dde..7f97a61 100644
--- a/target/product/aosp_aarch64.mk
+++ b/target/product/aosp_arm64.mk
@@ -20,10 +20,10 @@
# entirely appropriate to inherit from for on-device configurations.
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_aarch64/device.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
-PRODUCT_NAME := aosp_aarch64
-PRODUCT_DEVICE := generic_aarch64
+PRODUCT_NAME := aosp_arm64
+PRODUCT_DEVICE := generic_arm64
PRODUCT_BRAND := Android
-PRODUCT_MODEL := AOSP on ARM aarch64 Emulator
+PRODUCT_MODEL := AOSP on ARM arm64 Emulator