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

Commit 6aa5d986 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add framework-connectivity.impl 

The library will be included in the connectivity module APEX when
migrating its sources out of framework-minus-apex.

Bug: 171540887
Test: m
Change-Id: I1595521eaced6e6997c076bb56b06ffdd22a4fa0
parent c4b72cd7

packages/Connectivity/framework/Android.bp

+35 −0
Original line number Diff line number Diff line
@@ -83,3 +83,38 @@ java_sdk_library { 
    ],

    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",

    srcs: [

        ":framework-connectivity-sources",

    ],

    aidl: {

        include_dirs: [

            "frameworks/base/core/java", // For framework parcelables

            "frameworks/native/aidl/binder", // For PersistableBundle.aidl

        ],

    },

    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",

        "unsupportedappusage",

        "ServiceConnectivityResources",

    ],

    static_libs: [

        "net-utils-device-common",

    ],

    jarjar_rules: "jarjar-rules.txt",

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

    installable: true,

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

}

packages/Connectivity/framework/jarjar-rules.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
rule com.android.net.module.util.** android.net.connectivity.framework.util.@1



# TODO (b/149403767): remove the annotations from net-utils-device-common instead of here

zap android.annotation.**

zap com.android.net.module.annotation.**

zap com.android.internal.annotations.**