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

Commit 9dcdc3eb authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "Revert "remove telephony-common from boot class""

parents 5b7a2d8f 98cb2b38

core/construct_context.sh

+0 −5
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ fi 
if [[ "${target_sdk_version}" -lt "29" ]]; then

  add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"

fi

# TODO(b/139318877) Remove check for SDK_VERSION_CUR_DEVELOPMENT after cleaning up system apps targeting on

# current SDK version and link telephony-common

if [ "${target_sdk_version}" -lt "30" ] || [ "${target_sdk_version}" -eq "10000"]; then

  add_to_contexts "${conditional_host_libs_30}" "${conditional_target_libs_30}"

fi



add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}"

core/dex_preopt_odex_install.mk

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ ifdef LOCAL_DEX_PREOPT 
    org.apache.http.legacy \

    android.hidl.base-V1.0-java \

    android.hidl.manager-V1.0-java \

    telephony-common \



  my_dexpreopt_libs := $(sort \

    $(LOCAL_USES_LIBRARIES) \

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ PRODUCT_BOOT_JARS := \ 
    $(TARGET_CORE_JARS) \

    framework \

    ext \

    telephony-common \

    voip-common \

    ims-common \

    updatable-media