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

Commit 719ae706 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Build framework-connectivity using module_current" am: ea96653e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085

Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
parents 432f868e ea96653e

packages/Connectivity/framework/Android.bp

+15 −15
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ package { 


java_library {

    name: "framework-connectivity-protos",

    sdk_version: "module_current",

    proto: {

        type: "nano",

    },
@@ -82,8 +83,7 @@ java_sdk_library { 
    name: "framework-connectivity",

    api_only: true,

    defaults: ["framework-module-defaults"],

    // TODO: build against module API

    platform_apis: true,

    installable: true,

    srcs: [

        ":framework-connectivity-sources",

    ],
@@ -100,18 +100,15 @@ java_sdk_library { 
    libs: [

        "unsupportedappusage",

    ],

    permitted_packages: ["android.net", "com.android.connectivity.aidl"],

    permitted_packages: [

        "android.net",

        "com.android.connectivity.aidl",

    ],

}



java_library {

    name: "framework-connectivity.impl",

    // Instead of building against private API (framework.jar),

    // build against core_platform + framework-minus-apex + module

    // stub libs. This allows framework.jar to depend on this library,

    // so it can be part of the private API until all clients have been migrated.

    // TODO: just build against module_api, and remove this jar from

    // the private API.

    sdk_version: "core_platform",

    sdk_version: "module_current",

    srcs: [

        ":framework-connectivity-sources",

    ],
@@ -122,10 +119,10 @@ java_library { 
        ],

    },

    libs: [

        "framework-minus-apex",

        // TODO: just framework-tethering, framework-wifi when building against module_api

        "framework-tethering.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

        // TODO (b/183097033) remove once module_current includes core_current

        "stable.core.platform.api.stubs",

        "framework-tethering",

        "framework-wifi",

        "unsupportedappusage",

        "ServiceConnectivityResources",

    ],
@@ -136,5 +133,8 @@ java_library { 
    jarjar_rules: "jarjar-rules.txt",

    apex_available: ["com.android.tethering"],

    installable: true,

    permitted_packages: ["android.net", "com.android.connectivity.aidl"],

    permitted_packages: [

        "android.net",

        "com.android.connectivity.aidl",

    ],

}