diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index 68a4ecc60..c575ac7d7 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -33,6 +33,7 @@ PRODUCT_PACKAGES += \
 	zipalign \
 	bcc_compat \
 	bios.bin \
+	clang \
 	commons-compress-1.0 \
 	dexdump \
 	dmtracedump \
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 9b97a19a4..89f34a13b 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -34,6 +34,7 @@ WIN_TARGETS := \
 	aapt adb aidl \
 	aprotoc \
 	bcc_compat \
+	clang \
 	etc1tool \
 	dexdump dmtracedump \
 	fastboot \