commit 86f99d9c394a002e6b4a1f22e9e7268149cf3b07
author Dan Albert <danalbert@google.com> Tue Nov 29 11:09:12 2016 -0800
committer Dan Albert <danalbert@google.com> Wed Nov 30 19:52:30 2016 +0000
tree 58a929a9aefa585e78181102899c6485fc716c61
parent 84e269d5af7f6ae82afb066a6b69674180d44d2d

Ship all the UAPI bits.

Test: make ndk
Bug: None
Change-Id: I24507846fb62b5844e06d7a424497a5ffc0357d1
(cherry picked from commit 063e86ace8df5e00f69d99f6d9d138a7ab17df1f)

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 62ca943..d162d8d 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2000,10 +2000,21 @@
 // }
 
 ndk_headers {
-    name: "libc_linux",
-    from: "kernel/uapi/linux",
-    to: "linux",
-    srcs: ["kernel/uapi/linux/**/*.h"],
+    name: "libc_uapi",
+    from: "kernel/uapi",
+    to: "",
+    srcs: [
+        "kernel/uapi/asm-generic/**/*.h",
+        "kernel/uapi/drm/**/*.h",
+        "kernel/uapi/linux/**/*.h",
+        "kernel/uapi/misc/**/*.h",
+        "kernel/uapi/mtd/**/*.h",
+        "kernel/uapi/rdma/**/*.h",
+        "kernel/uapi/scsi/**/*.h",
+        "kernel/uapi/sound/**/*.h",
+        "kernel/uapi/video/**/*.h",
+        "kernel/uapi/xen/**/*.h",
+    ],
     license: "NOTICE",
 }
 
@@ -2016,14 +2027,6 @@
 }
 
 ndk_headers {
-    name: "libc_asm_generic",
-    from: "kernel/uapi/asm-generic",
-    to: "asm-generic",
-    srcs: ["kernel/uapi/asm-generic/**/*.h"],
-    license: "NOTICE",
-}
-
-ndk_headers {
     name: "libc_asm_arm",
     from: "kernel/uapi/asm-arm",
     to: "arm-linux-androideabi",