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

Change-Id: Ia307ddb9cffe74e9eaf7009924617b41d4facb76

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.

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) \