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

Commit 9f223cb0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Split out the connectivity API surface 

Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
parent 3ea9673b

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ filegroup { 
    srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-blobstore-sources",

        ":framework-connectivity-sources", // framework-connectivity is not yet a module

        ":framework-core-sources",

        ":framework-drm-sources",

        ":framework-graphics-nonupdatable-sources",
@@ -437,6 +436,7 @@ filegroup { 
    name: "framework-updatable-sources",

    srcs: [

        ":framework-appsearch-sources",

        ":framework-connectivity-sources",

        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

        ":framework-permission-sources",
@@ -639,6 +639,7 @@ java_defaults { 
    defaults: ["framework-aidl-export-defaults"],

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-connectivity-sources",

        "core/java/**/*.logtags",

    ],

    // See comment on framework-atb-backward-compatibility module below
@@ -700,6 +701,8 @@ java_library { 
    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base",

        // TODO: remove when framework-connectivity can build against API

        "//frameworks/base/packages/Connectivity/framework",

        // TODO(b/147128803) remove the below lines

        "//frameworks/base/apex/appsearch/framework",

        "//frameworks/base/apex/blobstore/framework",
@@ -1452,6 +1455,7 @@ java_library { 
    ],

    libs: [

        "framework-annotations-lib",

        "framework-connectivity",

        "unsupportedappusage",

    ],

    visibility: [

StubLibraries.bp

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ stubs_defaults { 
        local_include_dirs: [

            "apex/media/aidl/stable",

            "media/aidl",

            // TODO: move to include-dirs for packages/modules/Connectivity when this moves out of

            // frameworks/base

            "packages/Connectivity/framework/aidl-export",

            "telephony/java",

        ],

        include_dirs: ["frameworks/av/aidl"],
@@ -310,6 +313,7 @@ java_library_static { 
        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs",

        "framework-connectivity.stubs",

        "framework-graphics.stubs",

        "framework-media.stubs",

        "framework-mediaprovider.stubs",
@@ -334,6 +338,7 @@ java_library_static { 
        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs.system",

        "framework-connectivity.stubs.system",

        "framework-graphics.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",
@@ -374,6 +379,7 @@ java_library_static { 
        "art.module.public.api.stubs",

        "conscrypt.module.public.api.stubs",

        "framework-appsearch.stubs.system",

        "framework-connectivity.stubs.system",

        "framework-graphics.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

api/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ genrule { 
        ":art.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":framework-appsearch{.public.api.txt}",

        ":framework-connectivity{.public.api.txt}",

        ":framework-graphics{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",
@@ -95,6 +96,7 @@ genrule { 
        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":framework-appsearch{.public.stubs.source}",

        ":framework-connectivity{.public.stubs.source}",

        ":framework-graphics{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",
@@ -120,6 +122,7 @@ genrule { 
        ":art.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-appsearch{.public.removed-api.txt}",

        ":framework-connectivity{.public.removed-api.txt}",

        ":framework-graphics{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",
@@ -155,6 +158,7 @@ genrule { 
    srcs: [

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",

        ":framework-graphics{.system.api.txt}",

        ":framework-media{.system.api.txt}",

        ":framework-mediaprovider{.system.api.txt}",
@@ -208,6 +212,7 @@ genrule { 
    srcs: [

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",

        ":framework-graphics{.system.removed-api.txt}",

        ":framework-media{.system.removed-api.txt}",

        ":framework-mediaprovider{.system.removed-api.txt}",
@@ -243,6 +248,7 @@ genrule { 
    srcs: [

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",

        ":framework-graphics{.module-lib.api.txt}",

        ":framework-media{.module-lib.api.txt}",

        ":framework-mediaprovider{.module-lib.api.txt}",
@@ -298,6 +304,7 @@ genrule { 
    srcs: [

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",

        ":framework-graphics{.module-lib.removed-api.txt}",

        ":framework-media{.module-lib.removed-api.txt}",

        ":framework-mediaprovider{.module-lib.removed-api.txt}",