StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Provide library path to android.test.base for dexpreopt." am: 1c294551b4

Browse Source 
Change-Id: Ia307ddb9cffe74e9eaf7009924617b41d4facb76
This commit is contained in:
Ulyana Trafimovich
2020-06-01 15:18:13 +00:00
committed by Automerger Merge Worker
parent 5e113d40d0 1c294551b4
commit 25ed6113d5
2 changed files with 5 additions and 0 deletions
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) \