diff --git a/CleanSpec.mk b/CleanSpec.mk
index a1792ca5..abaf41cd 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -149,3 +149,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.recovery.$(PRODUCT_HARDWA
 
 # Remove build and default prop.
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/*.prop)
+
+# android.hardware.thermal@1.0-wahoo.so can be a static lib
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.thermal@1.0-wahoo.so)
diff --git a/thermal/Android.bp b/thermal/Android.bp
index fcd227e1..be1e7039 100644
--- a/thermal/Android.bp
+++ b/thermal/Android.bp
@@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {
     name: "android.hardware.thermal@1.1-wahoo",
     defaults: ["hidl_defaults"],
     owner: "qcom",