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

Commit f3114979 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Merge framework-connectivity impl and stub targets 

Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Bug: 183600168
Test: m
Change-Id: I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165
parent a1398df0

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ java_library { 
    ],

    libs: [

        "framework-annotations-lib",

        "framework-connectivity",

        "framework-connectivity.stubs.module_lib",

        "unsupportedappusage",

    ],

    visibility: [

packages/Connectivity/framework/Android.bp

+27 −32
Original line number Diff line number Diff line
@@ -82,11 +82,13 @@ filegroup { 


java_sdk_library {

    name: "framework-connectivity",

    api_only: true,

    sdk_version: "module_current",

    min_sdk_version: "30",

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

    installable: true,

    srcs: [

        ":framework-connectivity-sources",

        ":net-utils-framework-common-srcs",

    ],

    aidl: {

        include_dirs: [
@@ -98,10 +100,34 @@ java_sdk_library { 
            "frameworks/native/aidl/binder", // For PersistableBundle.aidl

        ],

    },

    impl_only_libs: [

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

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

        "framework-tethering.stubs.module_lib",

        "framework-wifi.stubs.module_lib",

        "net-utils-device-common",

    ],

    libs: [

        "unsupportedappusage",

    ],

    static_libs: [

        "framework-connectivity-protos",

    ],

    jarjar_rules: "jarjar-rules.txt",

    permitted_packages: ["android.net"],

    impl_library_visibility: [

        "//packages/modules/Connectivity/Tethering/apex",

        // In preparation for future move

        "//packages/modules/Connectivity/apex",

        "//packages/modules/Connectivity/service",

        "//frameworks/base/packages/Connectivity/service",

        "//frameworks/base",

        "//packages/modules/Connectivity/Tethering/tests/unit",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}



cc_defaults {
@@ -149,37 +175,6 @@ cc_library_shared { 
    shared_libs: ["libandroid"],

    stl: "libc++_static",

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}
 


java_library {

    name: "framework-connectivity.impl",

    sdk_version: "module_current",

    min_sdk_version: "30",

    srcs: [

        ":framework-connectivity-sources",

    ],

    aidl: {

        include_dirs: [

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

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

        ],

    },

    libs: [

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

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

        "framework-tethering",

        "framework-wifi",

        "unsupportedappusage",

    ],

    static_libs: [

        "framework-connectivity-protos",

        "net-utils-device-common",

    ],

    jarjar_rules: "jarjar-rules.txt",

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

    installable: true,

    permitted_packages: ["android.net"],

}

packages/Connectivity/service/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ java_library { 
        "service-connectivity-protos",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}
@@ -100,7 +99,6 @@ java_library { 
    ],

    libs: ["libprotobuf-java-nano"],

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}
@@ -115,7 +113,6 @@ java_library { 
    ],

    jarjar_rules: "jarjar-rules.txt",

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

    ],

}