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

Commit 09209e05 authored by Hyein Yu's avatar Hyein Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "add_lib_telephony_module" into main 

* changes:
  Add library of telephony module to the bootclasspath
  [telephony] Create a new build flag for the module
parents f7433373 beaef316

core/android_soong_config_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -263,6 +263,10 @@ $(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

+5 −0
Original line number Diff line number Diff line
@@ -387,6 +387,11 @@ 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

+6 −0
Original line number Diff line number Diff line
@@ -147,6 +147,12 @@ 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.