Merge "Move FORCE_BUILD_LLVM_COMPONENTS to a defaults module"
diff --git a/Android.bp b/Android.bp
index b0d30b5..64b1f40 100644
--- a/Android.bp
+++ b/Android.bp
@@ -165,9 +165,12 @@
     out: ["clang/Basic/Version.inc"],
 }
 
-llvm_cc_library_shared {
+cc_library_shared {
     name: "libclang",
-    defaults: ["clang-defaults"],
+    defaults: [
+        "clang-defaults",
+        "force_build_llvm_components",
+    ],
 
     host_supported: true,