diff --git a/shared_clang.mk b/shared_clang.mk
index 6850a2e..151a626 100644
--- a/shared_clang.mk
+++ b/shared_clang.mk
@@ -6,19 +6,24 @@
 LOCAL_PATH:= $(call my-dir)
 
 clang_whole_static_libraries := \
-	libclangDriver \
-	libclangParse \
-	libclangSema \
 	libclangAnalysis \
-	libclangCodeGen \
 	libclangAST \
-	libclangEdit \
-	libclangLex \
-	libclangFrontend \
+	libclangASTMatchers \
 	libclangBasic \
+	libclangCodeGen \
+	libclangDriver \
+	libclangEdit \
+	libclangFormat \
+	libclangFrontend \
+	libclangIndex \
+	libclangLex \
+	libclangLibclang \
+	libclangParse \
 	libclangRewrite \
 	libclangRewriteFrontend \
-	libclangSerialization
+	libclangSema \
+	libclangSerialization \
+	libclangTooling
 
 # host
 include $(CLEAR_VARS)