diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-06-01 15:05:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-01 15:05:25 +0000 |
| commit | 1c294551b4c229d8499ae419c8fcbf135769386e (patch) | |
| tree | 7b330af8fbab88fc20a41171e98cc1cc94ae1e66 | |
| parent | 61e1cc73178d254fa79d94511c964ab0c9ffc3b4 (diff) | |
| parent | 0b0cf4c41189aacca4b3ce01d93a4aeaac2b8b6f (diff) | |
| download | build-1c294551b4c229d8499ae419c8fcbf135769386e.tar.gz | |
Merge "Provide library path to android.test.base for dexpreopt."
| -rwxr-xr-x | core/construct_context.sh | 4 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/construct_context.sh b/core/construct_context.sh index 794795a7b5..d620d0846b 100755 --- a/core/construct_context.sh +++ b/core/construct_context.sh @@ -67,6 +67,10 @@ if [[ "${target_sdk_version}" -lt "29" ]]; then 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. diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index a33b2b4d53..2a2427dcce 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -195,6 +195,7 @@ ifdef LOCAL_DEX_PREOPT org.apache.http.legacy \ android.hidl.base-V1.0-java \ android.hidl.manager-V1.0-java \ + android.test.base \ my_dexpreopt_libs := $(sort \ $(LOCAL_USES_LIBRARIES) \ |