commit 6bc732100b24f5a90b30c753f4287db54a35b8e3
author Pirama Arumuga Nainar <pirama@google.com> Sun Jul 30 08:16:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Jul 30 08:16:15 2017 +0000
tree 4a53dfc3d9b9c094c4d6d24e8df789b38bd55d72
parent 2fae59aeaf2ac933be287f92b4dd1874d94af0b8
parent df88d62268d8c7703b32d09e4f77120249e2d9f3

Merge "Build libclang_android.so" am: d297dca014 am: 9a816162b3 am: 745c89b974 am: c81e954f78
am: df88d62268

Change-Id: I27458d6907c0638926bd0c25cbb695c8e1577a8b

Android.bp

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",