commit d1973ca51325393f304e82a4d79874f33e54ac16
author Colin Cross <ccross@android.com> Tue Jan 21 19:50:58 2014 -0800
committer Colin Cross <ccross@android.com> Thu Jan 23 18:35:39 2014 -0800
tree 75a657d895a41aa4855a06ef1e0e986c963e0eef
parent 5b4884fac90753c68d401de73036c2de919958eb

bionic: rename aarch64 target to arm64

Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3

libc/kernel/tools/generate_uapi_headers.sh

diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index de89838..9eeb2a5 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -186,22 +186,16 @@
           "${ANDROID_KERNEL_DIR}/uapi"
 
 for arch in "${ARCH_LIST[@]}"; do
-  if [[ "$arch" == "arm64" ]]; then
-    # The Android headers use aarch64 as the name of the 64 bit arm headers.
-    tgt_arch="asm-aarch64"
-  else
-    tgt_arch="asm-${arch}"
-  fi
   # Copy arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
   # Copy the generated arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/generated/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
 
   # Special copy of generated header files from arch/<ARCH>/generated/asm that
   # also exist in uapi/asm-generic.
   copy_if_exists "${KERNEL_DIR}/common/include/uapi/asm-generic" \
                  "${KERNEL_DIR}/common/arch/${arch}/include/generated/asm" \
-                 "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}/asm"
+                 "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}/asm"
 done