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

Commit 48462ab5 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add connectivity protos to framework-connectivity

The protos are built separately by framework-connectivity from framework
protos, keeping only android.net protos for the connectivity jar.

Bug: 171860710
Test: m framework-connectivity.impl
Change-Id: I2c4a37ff2ee9e8efde49885feeafa27dcff7ca2c
parent 6d65ee19
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -23,6 +23,25 @@ package {
    default_applicable_licenses: ["frameworks_base_license"],
}

java_library {
    name: "framework-connectivity-protos",
    proto: {
        type: "nano",
    },
    srcs: [
        // TODO: consider moving relevant .proto files directly to the module directory
        ":framework-javastream-protos",
    ],
    apex_available: [
        "//apex_available:platform",
        "com.android.tethering",
    ],
    jarjar_rules: "jarjar-rules-proto.txt",
    visibility: [
        "//visibility:private",
    ],
}

filegroup {
    name: "framework-connectivity-internal-sources",
    srcs: [
@@ -111,6 +130,7 @@ java_library {
        "ServiceConnectivityResources",
    ],
    static_libs: [
        "framework-connectivity-protos",
        "net-utils-device-common",
    ],
    jarjar_rules: "jarjar-rules.txt",
+3 −0
Original line number Diff line number Diff line
keep android.net.NetworkCapabilitiesProto
keep android.net.NetworkProto
keep android.net.NetworkRequestProto
+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ zap android.annotation.**
zap com.android.net.module.annotation.**
zap com.android.internal.annotations.**

rule android.net.NetworkCapabilitiesProto* android.net.connectivity.proto.NetworkCapabilitiesProto@1
rule android.net.NetworkProto* android.net.connectivity.proto.NetworkProto@1
rule android.net.NetworkRequestProto* android.net.connectivity.proto.NetworkRequestProto@1