openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ulya Trafimovich 2020-06-01 10:08:23 +01:00
parent 61e1cc7317
commit 0b0cf4c411
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/construct_context.sh
View File

@ -67,6 +67,10 @@ if [[ "${target_sdk_version}" -lt "29" ]]; then
add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}" add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"
fi 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}" add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}"
# Generate the actual context string. # Generate the actual context string.

1
core/dex_preopt_odex_install.mk
View File

@ -195,6 +195,7 @@ ifdef LOCAL_DEX_PREOPT
org.apache.http.legacy \ org.apache.http.legacy \
android.hidl.base-V1.0-java \ android.hidl.base-V1.0-java \
android.hidl.manager-V1.0-java \ android.hidl.manager-V1.0-java \
android.test.base \
my_dexpreopt_libs := $(sort \ my_dexpreopt_libs := $(sort \
$(LOCAL_USES_LIBRARIES) \ $(LOCAL_USES_LIBRARIES) \