commit f563ae89be76fbe43a0299ed17485abd06927b6a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 30 19:43:29 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 30 19:43:30 2016 +0000
tree e7474c908f4c8fe55845f8f2f98c28e855fb7d6e
parent 04a3b24d7e11cf330e3bb637641966ce951cb387
parent 063e86ace8df5e00f69d99f6d9d138a7ab17df1f

Merge "Ship all the UAPI bits."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 094ad5c..2ce217e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2009,10 +2009,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",
 }
 
@@ -2025,14 +2036,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",