Remove libclang.so
Bug: http://b/64121881
Remove the libclang.so module (and retain libclang_android.so).
Simplify the declarations now that there's only one variant.
Test: aosp_marlin checkbuild with FORCE_BUILD_LLVM_COMPONENTS set and
unset.
Change-Id: I5b2475062982933f2971e788d3f8d05296d170d6
diff --git a/Android.bp b/Android.bp
index 1c6ec24..ad454d5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,8 +185,8 @@
out: ["clang/Basic/Version.inc"],
}
-cc_defaults {
- name: "libclang-defaults",
+cc_library_shared {
+ name: "libclang_android",
defaults: [
"clang-defaults",
"force_build_llvm_components",
@@ -216,6 +216,8 @@
"libclangToolingCore",
],
+ export_shared_lib_headers: ["libLLVM_android"],
+ shared_libs: ["libLLVM_android"],
export_header_lib_headers: ["clang-headers"],
target: {
@@ -239,20 +241,6 @@
},
}
-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",
