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

Commit ac830af6 authored May 01, 2025 by Chaitanya Cheemala (xWF) Committed by Android (Google) Code Review May 01, 2025

Merge changes from topic "revert-33263850-add_lib_telephony_module-SLYCQDKTYW" into main

* changes:
  Revert "[telephony] Create a new build flag for the module"
  Revert "Add library of telephony module to the bootclasspath"

parents 09209e05 c69e3210

core/android_soong_config_vars.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -263,10 +263,6 @@ $(call soong_config_set,bootclasspath,release_package_profiling_module,$(RELEASE
		# Move VCN from platform to the Tethering module; used by both platform and module
		$(call soong_config_set,ANDROID,is_vcn_in_mainline,$(RELEASE_MOVE_VCN_TO_MAINLINE))

		# Add telephony build flag to soong
		$(call soong_config_set,ANDROID,release_telephony_module,$(RELEASE_TELEPHONY_MODULE))
		$(call soong_config_set,bootclasspath,release_telephony_module,$(RELEASE_TELEPHONY_MODULE))

		# Add perf-setup build flag to soong
		# Note: BOARD_PERFSETUP_SCRIPT location must be under platform_testing/scripts/perf-setup/.
		ifdef BOARD_PERFSETUP_SCRIPT

target/product/base_system.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -387,11 +387,6 @@ ifneq ($(RELEASE_MOVE_VCN_TO_MAINLINE),true)
		framework-connectivity-b
		endif

		ifeq ($(RELEASE_TELEPHONY_MODULE),true)
		PRODUCT_PACKAGES += \
		com.android.telephony
		endif

		ifneq (,$(RELEASE_RANGING_STACK))
		PRODUCT_PACKAGES += \
		com.android.ranging

target/product/default_art_config.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -147,12 +147,6 @@ else

		endif

		ifeq ($(RELEASE_TELEPHONY_MODULE),true)
		PRODUCT_APEX_BOOT_JARS += \
		com.android.telephony:framework-telephony \

		endif

		# List of system_server classpath jars delivered via apex.
		# Keep the list sorted by module names and then library names.
		# Note: For modules available in Q, DO NOT add new entries here.