diff --git a/root.bp b/root.bp
index 7e4636f8c..8b3b71fa8 100644
--- a/root.bp
+++ b/root.bp
@@ -28,14 +28,7 @@ optional_subdirs = [
     "packages/apps/HTMLViewer",
     "prebuilts/ndk",
     "prebuilts/sdk",
-    "system/core/*",
-    "system/extras/*",
-    "system/keymaster",
-    "system/hwservicemanager",
-    "system/libhidl",
-    "system/libhwbinder",
-    "system/media/*",
-    "system/security/*",
+    "system/*",
     "system/tools/*",
     "test/vts",
 ]