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

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

Merge "Revert^2 "Adding java library in telephony module"" into main

parents 3d140e7c 3563fef6
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ combined_apis {
            "framework-ranging",
        ],
        default: [],
    }) + select(release_flag("RELEASE_TELEPHONY_MODULE"), {
        true: [
            "framework-telephony",
        ],
        default: [],
    }),
    system_server_classpath: [
        "service-art",
+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ soong_config_module_type {
        "release_crashrecovery_module",
        "release_ondevice_intelligence_module",
        "release_package_profiling_module",
        "release_telephony_module",
    ],
    properties: [
        "fragments",
@@ -195,6 +196,15 @@ custom_platform_bootclasspath {
                },
            ],
        },
        release_telephony_module: {
            fragments: [
                // only used if telephony is enabled.
                {
                    apex: "com.android.telephony",
                    module: "com.android.telephony-bootclasspath-fragment",
                },
            ],
        },
    },

    // Additional information needed by hidden api processing.