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

Commit 6b9429e1 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Move telephony framework sources as part of non-update framework." into... 

Merge "Move telephony framework sources as part of non-update framework." into rvc-dev am: d961f717

Change-Id: I37f2d2501058fe3cea50b40ac72dc359d5c7c72b
parents 5c897b56 d961f717

Android.bp

+4 −6
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ filegroup { 
        ":framework-sax-sources",

        ":framework-telecomm-sources",

        ":framework-telephony-common-sources",

        ":framework-telephony-sources",

        ":framework-wifi-annotations",

        ":framework-wifi-non-updatable-sources",

        ":PacProcessor-aidl-sources",
@@ -285,7 +286,6 @@ filegroup { 
        ":framework-permission-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-telephony-sources",

        ":framework-tethering-srcs",

        ":framework-wifi-updatable-sources",

        ":updatable-media-srcs",
@@ -300,7 +300,6 @@ java_library { 
        "framework-permission-stubs-module_libs_api",

        "framework-sdkextensions-stubs-module_libs_api",

        "framework-statsd-stubs-module_libs_api",

        "framework-telephony-stubs", // TODO: Update to module_libs_api when there is one.

        "framework-tethering-stubs-module_libs_api",

        "framework-wifi-stubs-module_libs_api",

    ],
@@ -523,9 +522,8 @@ java_library { 
    defaults: ["framework-aidl-export-defaults"],

    installable: false, // this lib is a build-only library

    static_libs: [

        "app-compat-annotations",

        "framework-minus-apex",

        // TODO (b/147688669) should be removed

        "framework-telephony",

        "framework-updatable-stubs-module_libs_api",

    ],

    sdk_version: "core_platform",
@@ -1326,8 +1324,8 @@ java_library { 
java_library {

    name: "framework-telephony",

    srcs: [

        ":framework-telephony-sources",

        ":framework-telephony-shared-srcs",

        //":framework-telephony-sources",

        //":framework-telephony-shared-srcs",

    ],

    // TODO: change to framework-system-stub to build against system APIs.

    libs: [