commit f07fd6aeb3210768aa53deef1363eaa0654d051b
author Steven Moreland <smoreland@google.com> Mon Apr 10 15:30:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 10 15:30:03 2017 +0000
tree 67a1e17e0ceb7c63bddd400062a613f365d53610
parent b93d3c26f7dacb860ae2fef0567beae47c49e24a
parent e3c002431a0830832d64dfb7e478de122e9cfb5a

Merge "Build the versioner even on unbundled branches." into oc-dev

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 1472bc9..cb04c6f 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2176,6 +2176,63 @@
     first_version: "9",
 }
 
+llndk_library {
+    name: "libc.llndk",
+    symbol_file: "libc.map.txt",
+    export_headers_as_system: true,
+    export_preprocessed_headers: ["include"],
+    arch: {
+        arm: {
+            export_include_dirs: [
+                "arch-arm/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-arm",
+                "kernel/android/uapi",
+            ],
+        },
+        arm64: {
+            export_include_dirs: [
+                "arch-arm64/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-arm64",
+                "kernel/android/uapi",
+            ],
+        },
+        mips: {
+            export_include_dirs: [
+                "arch-mips/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-mips",
+                "kernel/android/uapi",
+            ],
+        },
+        mips64: {
+            export_include_dirs: [
+                "arch-mips64/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-mips",
+                "kernel/android/uapi",
+            ],
+        },
+        x86: {
+            export_include_dirs: [
+                "arch-x86/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-x86",
+                "kernel/android/uapi",
+            ],
+        },
+        x86_64: {
+            export_include_dirs: [
+                "arch-x86_64/include",
+                "kernel/uapi",
+                "kernel/uapi/asm-x86",
+                "kernel/android/uapi",
+            ],
+        },
+    },
+}
+
 ndk_library {
     name: "libstdc++.ndk",
     symbol_file: "libstdc++.map.txt",

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 5b67e38..8c6b47e 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -124,3 +124,8 @@
     symbol_file: "libdl.map.txt",
     first_version: "9",
 }
+
+llndk_library {
+    name: "libdl.llndk",
+    symbol_file: "libdl.map.txt",
+}

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index 7489bfe..24e641c 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -538,3 +538,8 @@
     symbol_file: "libm.map.txt",
     first_version: "9",
 }
+
+llndk_library {
+    name: "libm.llndk",
+    symbol_file: "libm.map.txt",
+}