Provide library path to android.test.base for dexpreopt.
It may be needed in class loader context if the target API version
is less than 30.
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ifa5ab18d1dc322184100207ad6eee4bdcf74deb0
diff --git a/core/construct_context.sh b/core/construct_context.sh
index 794795a..d620d08 100755
--- a/core/construct_context.sh
+++ b/core/construct_context.sh
@@ -67,6 +67,10 @@
add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"
fi
+if [[ "${target_sdk_version}" -lt "30" ]]; then
+ add_to_contexts "${conditional_host_libs_30}" "${conditional_target_libs_30}"
+fi
+
add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}"
# Generate the actual context string.