Merge "build: rename aarch64 target to arm64"

core/combo/TARGET_linux-arm64.mk

@@ -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

@@ -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_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 @@ 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

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

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

target/product/AndroidProducts.mk

@@ -41,7 +41,7 @@ PRODUCT_MAKEFILES := \
     $(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 @@ PRODUCT_MAKEFILES := \
     $(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 \

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_NAME := aosp_arm64
-PRODUCT_DEVICE := generic_aarch64
+PRODUCT_DEVICE := generic_arm64
 PRODUCT_BRAND := Android
-PRODUCT_MODEL := AOSP on ARM aarch64 Emulator
+PRODUCT_MODEL := AOSP on ARM arm64 Emulator