diff options
| author | Christopher Ferris <cferris@google.com> | 2018-04-25 21:00:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-25 21:00:59 +0000 |
| commit | 6c4e77dd4aaf2050b9e8c0f4783d9c96e628cedc (patch) | |
| tree | 62c5bea07cf50e05505177d3db984e4dab2d6ac4 /libc/kernel/tools/generate_uapi_headers.sh | |
| parent | 67b5979930ba81477cf5f835b1fe23563ee9c761 (diff) | |
| parent | 5ed15ba7337f19e27986ec953d83cf6a8464470f (diff) | |
Merge "Remove ion.h from bionic uapi headers."
Diffstat (limited to 'libc/kernel/tools/generate_uapi_headers.sh')
| -rwxr-xr-x | libc/kernel/tools/generate_uapi_headers.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh index 4603fbee6..575da3148 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}/include/uapi" "${ANDROID_KERNEL_DIR}/uapi" 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" |