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

Commit ab48d7ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

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

* changes:
  Revert "Revert "Add library of telephony module to the bootclass..."
  Revert^2 "[telephony] Create a new build flag for the module"
parents 2c898a05 9576c8a9

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.

target/product/generic/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -906,6 +906,11 @@ system_image_defaults { 
                    "com.android.uprobestats", // base_system (RELEASE_UPROBESTATS_MODULE)

                ],

                default: [],

            }) + select(release_flag("RELEASE_TELEPHONY_MODULE"), {

                true: [

                    "com.android.telephony", // base_system (RELEASE_TELEPHONY_MODULE)

                ],

                default: [],

            }),

        },

        prefer32: {