3 files changed, 9 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index a44a2c625..f2230ae00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,7 @@ cc_defaults {
     ],
 
     static_libs: [
+        "libinstall",
         "librecovery_fastboot",
         "libminui",
         "libotautil",
@@ -93,7 +94,6 @@ cc_library_static {
     ],
 
     shared_libs: [
-        "libinstall",
         "librecovery_ui",
     ],
 }
@@ -113,7 +113,6 @@ cc_binary {
     ],
 
     shared_libs: [
-        "libinstall",
         "libminadbd_services",
         "librecovery_ui",
     ],
diff --git a/CleanSpec.mk b/CleanSpec.mk
index fec823e7e..a7ab0d9be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,9 +44,13 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/recovery_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libminui_intermediates/import_includes)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libinstall.recovery_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/system/lib64/libinstall.so)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
diff --git a/install/Android.bp b/install/Android.bp
index aa47990ae..221ce72a0 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -47,7 +47,7 @@ cc_defaults {
     ],
 }
 
-cc_library {
+cc_library_static {
     name: "libinstall",
     recovery_available: true,