From 98cb2b3878a7aa578344d06445d00e211b7abfe4 Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Tue, 24 Sep 2019 01:24:32 +0000 Subject: [PATCH] Revert "remove telephony-common from boot class" This reverts commit 195de31de7135664389fd42b945a350a482f476b. Reason for revert: Change-Id: I97dc0678ac50022a7f0f6bbc626b4747ee6d28c0 Bug: 140639952 --- core/construct_context.sh | 5 ----- core/dex_preopt_odex_install.mk | 1 - target/product/base_system.mk | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core/construct_context.sh b/core/construct_context.sh index 34f7ee673..794795a7b 100755 --- a/core/construct_context.sh +++ b/core/construct_context.sh @@ -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}" diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 821e02bf9..50e922e36 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -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) \ diff --git a/target/product/base_system.mk b/target/product/base_system.mk index e5c5f3487..f2b98c5ea 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -326,6 +326,7 @@ PRODUCT_BOOT_JARS := \ $(TARGET_CORE_JARS) \ framework \ ext \ + telephony-common \ voip-common \ ims-common \ updatable-media