commit 5ed15ba7337f19e27986ec953d83cf6a8464470f
author Christopher Ferris <cferris@google.com> Tue Apr 24 12:29:18 2018 -0700
committer Christopher Ferris <cferris@google.com> Tue Apr 24 13:33:30 2018 -0700
tree 62c5bea07cf50e05505177d3db984e4dab2d6ac4
parent 67b5979930ba81477cf5f835b1fe23563ee9c761

Remove ion.h from bionic uapi headers.

Bug: 77976082

Test: Ran the generate script and verified ion.h is deleted.
Change-Id: I33b3aeef66f08f35dd496a073931b2fe2c80a1d6

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 4603fbe..575da31 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -248,6 +248,9 @@
 copy_hdrs "${KERNEL_DIR}/${src_dir}/drivers/staging/android/uapi" \
           "${ANDROID_KERNEL_DIR}/uapi/linux" "no-copy-dirs"
 
+# Remove ion.h, it's not fully supported by the upstream kernel (see b/77976082).
+rm "${ANDROID_KERNEL_DIR}/uapi/linux/ion.h"
+
 # Copy the generated headers.
 copy_hdrs "${KERNEL_DIR}/${src_dir}/include/generated/uapi" \
           "${ANDROID_KERNEL_DIR}/uapi"