commit 1c294551b4c229d8499ae419c8fcbf135769386e
author Ulyana Trafimovich <skvadrik@google.com> Mon Jun 01 15:05:25 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 15:05:25 2020 +0000
tree 7b330af8fbab88fc20a41171e98cc1cc94ae1e66
parent 61e1cc73178d254fa79d94511c964ab0c9ffc3b4
parent 0b0cf4c41189aacca4b3ce01d93a4aeaac2b8b6f

Merge "Provide library path to android.test.base for dexpreopt."

core/construct_context.sh

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.

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index a33b2b4..2a2427d 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -195,6 +195,7 @@
     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) \