diff --git a/Android.bp b/Android.bp
index e048538..009ab86 100644
--- a/Android.bp
+++ b/Android.bp
@@ -176,8 +176,8 @@
     out: ["clang/Basic/Version.inc"],
 }
 
-cc_library_shared {
-    name: "libclang",
+cc_defaults {
+    name: "libclang-defaults",
     defaults: [
         "clang-defaults",
         "force_build_llvm_components",
@@ -207,8 +207,6 @@
         "libclangToolingCore",
     ],
 
-    export_shared_lib_headers: ["libLLVM"],
-    shared_libs: ["libLLVM"],
     export_header_lib_headers: ["clang-headers"],
 
     target: {
@@ -245,6 +243,20 @@
     },
 }
 
+cc_library_shared {
+    name: "libclang",
+    defaults: ["libclang-defaults"],
+    export_shared_lib_headers: ["libLLVM"],
+    shared_libs: ["libLLVM"],
+}
+
+cc_library_shared {
+    name: "libclang_android",
+    defaults: ["libclang-defaults"],
+    export_shared_lib_headers: ["libLLVM_android"],
+    shared_libs: ["libLLVM_android"],
+}
+
 subdirs = [
     "lib",
     "soong",