diff --git a/root.bp b/root.bp
index fbd0be2a8..413d94460 100644
--- a/root.bp
+++ b/root.bp
@@ -5,10 +5,13 @@ subdirs = [
     "bionic",
     "dalvik",
     "external/*",
+    "frameworks/base/libs/*",
+    "frameworks/base/tools/*",
+    "frameworks/native/libs/*",
+    "hardware/*",
     "libcore",
     "libnativehelper",
     "prebuilts/ndk",
     "prebuilts/sdk",
     "system/core/*",
-    "frameworks/base/tools/aidl",
 ]