Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f77575e authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

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

Merge "Provide library path to android.test.base for dexpreopt." am: 1c294551 am: 25ed6113 am: 9e92b178 am: 963e3634 am: e5aed5cf

Change-Id: Ica103b5e92f5eb157c3bdb789e43d6fb3dcb5ffd
parents a656aafe e5aed5cf

core/construct_context.sh

+4 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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) \