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

Commit 9576c8a9 authored by Hyein Yu's avatar Hyein Yu
Browse files

Revert "Revert "Add library of telephony module to the bootclass..." 

Revert submission 33350110-revert-33263850-add_lib_telephony_module-SLYCQDKTYW

Reason for revert: Re-land the changes with fix

Reverted changes: /q/submissionid:33350110-revert-33263850-add_lib_telephony_module-SLYCQDKTYW

Bug: 409547011
Bug: 409546611
Test: build
Flag: build.RELEASE_TELEPHONY_MODULE
Change-Id: Iadb084d2b1fe2cb410c035fcc58ff0748fe1db60
parent f373a4dd

target/product/base_system.mk

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

        framework-connectivity-b

endif

endif





ifeq ($(RELEASE_TELEPHONY_MODULE),true)

    PRODUCT_PACKAGES += \

       com.android.telephony

endif



ifneq (,$(RELEASE_RANGING_STACK))

ifneq (,$(RELEASE_RANGING_STACK))

    PRODUCT_PACKAGES += \

    PRODUCT_PACKAGES += \

        com.android.ranging

        com.android.ranging

target/product/default_art_config.mk

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




endif

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.

# List of system_server classpath jars delivered via apex.

# Keep the list sorted by module names and then library names.

# Keep the list sorted by module names and then library names.

# Note: For modules available in Q, DO NOT add new entries here.

# Note: For modules available in Q, DO NOT add new entries here.

target/product/generic/Android.bp

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

                    "com.android.uprobestats", // base_system (RELEASE_UPROBESTATS_MODULE)

                ],

                ],

                default: [],

                default: [],

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

                true: [

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

                ],

                default: [],

            }),

            }),

        },

        },

        prefer32: {

        prefer32: {