From 4c9c891fc47e330e5fc8dcdf828bd7b516aced63 Mon Sep 17 00:00:00 2001
From: Pete Bentley <prb@google.com>
Date: Thu, 8 Oct 2020 16:17:36 +0100
Subject: [PATCH] Add clean step to remove Soong's host copies of
 libconscrypt_openjdk_jni.so

An ABI incompatible change along with inability to
express the JNI dependency can result in build failures, see
b/170311371#comment8 for how to reproduce.  Tested by using that
repro and verifying this clean step fixes it.  Hopefully the
path being removed is correct for all host platforms.

Fixes: 170311371
Bug: 170389375
Test: As described above
Change-Id: I95ea952bf31d8e9caa8c42d21f2db1968cbe9097
---
 CleanSpec.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 67aca7c81a..41defb208f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -751,6 +751,10 @@ $(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar)
 $(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
 # ************************************************