p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Pete Bentley 2020-10-08 16:17:36 +01:00
parent f07902e84f
commit 4c9c891fc4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@ -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
# ************************************************