diff --git a/cc/clang.go b/cc/clang.go
index 6b25d4fac..f3ced687c 100644
--- a/cc/clang.go
+++ b/cc/clang.go
@@ -23,6 +23,7 @@ var clangUnknownCflags = []string{
 	"-Wno-unused-but-set-variable",
 	"-Wno-unused-but-set-parameter",
 	"-Wno-unused-local-typedefs",
+	"-Wunused-but-set-parameter",
 
 	// arm + arm64 + mips + mips64
 	"-fgcse-after-reload",
diff --git a/root.bp b/root.bp
index 2dd14d4ae..247c96c75 100644
--- a/root.bp
+++ b/root.bp
@@ -1,7 +1,9 @@
 subdirs = [
+    "art",
     "build/blueprint",
     "build/soong",
     "bionic/*",
     "external/*",
+    "libnativehelper",
     "system/core/*",
 ]