Merge "Add clean step to remove Soong's host copies of libconscrypt_openjdk_jni.so" am: f00bfe0105 am: c8acaa6f82 am: a8fb0f2d0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1455015
Change-Id: I1d3e122e7069546c0dff3c71a4d354a55a427c73
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 67aca7c..41defb2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -751,6 +751,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/prop.default)
+# Workaround for Soong not being able to rebuild the host binary if its
+# JNI dependencies change: b/170389375
+$(call add-clean-step, rm -rf $(OUT_DIR)/soong/host/*/lib*/libconscrypt_openjdk_jni.so)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************