forked from openkylin/platform_build
Revert "remove telephony-common from boot class"
This reverts commit 195de31de7
.
Reason for revert: <performance regression>
Change-Id: I97dc0678ac50022a7f0f6bbc626b4747ee6d28c0
Bug: 140639952
This commit is contained in:
parent
195de31de7
commit
98cb2b3878
|
@ -66,11 +66,6 @@ fi
|
||||||
if [[ "${target_sdk_version}" -lt "29" ]]; then
|
if [[ "${target_sdk_version}" -lt "29" ]]; then
|
||||||
add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"
|
add_to_contexts "${conditional_host_libs_29}" "${conditional_target_libs_29}"
|
||||||
fi
|
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}"
|
add_to_contexts "${dex_preopt_host_libraries}" "${dex_preopt_target_libraries}"
|
||||||
|
|
||||||
|
|
|
@ -187,7 +187,6 @@ ifdef LOCAL_DEX_PREOPT
|
||||||
org.apache.http.legacy \
|
org.apache.http.legacy \
|
||||||
android.hidl.base-V1.0-java \
|
android.hidl.base-V1.0-java \
|
||||||
android.hidl.manager-V1.0-java \
|
android.hidl.manager-V1.0-java \
|
||||||
telephony-common \
|
|
||||||
|
|
||||||
my_dexpreopt_libs := $(sort \
|
my_dexpreopt_libs := $(sort \
|
||||||
$(LOCAL_USES_LIBRARIES) \
|
$(LOCAL_USES_LIBRARIES) \
|
||||||
|
|
|
@ -326,6 +326,7 @@ PRODUCT_BOOT_JARS := \
|
||||||
$(TARGET_CORE_JARS) \
|
$(TARGET_CORE_JARS) \
|
||||||
framework \
|
framework \
|
||||||
ext \
|
ext \
|
||||||
|
telephony-common \
|
||||||
voip-common \
|
voip-common \
|
||||||
ims-common \
|
ims-common \
|
||||||
updatable-media
|
updatable-media
|
||||||
|
|
Loading…
Reference in New Issue