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

Commit 298cd36e authored by David Su's avatar David Su
Browse files

framework.jar - include framework-wifi-stubs instead of framework-wifi (Attempt 2) 

Stop exporting @hide APIs from framework-wifi
to framework.jar by including framework-wifi-stubs
instead. At this point no code is allowed to call @hide APIs
defined in framework-wifi unless they have an explicit
exemption.

Attempt 1 broke the build, trying again.

Bug: 140299412
Change-Id: I3eecb0a5f6b1c0be85d684d190465d591994d99f
Test: boots up and connects to Wifi
parent 2a96126e

Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -499,8 +499,7 @@ java_library { 
        "framework-sdkextensions-stubs-systemapi",

        // TODO(b/146167933): Use framework-statsd-stubs instead.

        "framework-statsd",

        // TODO(b/140299412): should be framework-wifi-stubs

        "framework-wifi",

        "framework-wifi-stubs",

        "ike-stubs",

        // TODO(b/147200698): should be the stub of framework-tethering

        "framework-tethering",
@@ -539,7 +538,8 @@ java_library { 
        "compat-changeid-annotation-processor",

    ],

    static_libs: [

        "exoplayer2-core"

        "exoplayer2-core",

        "android.hardware.wifi-V1.0-java-constants",

    ]

}
@@ -1231,6 +1231,7 @@ filegroup { 
        "core/java/com/android/internal/util/StateMachine.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

    ],

    visibility: ["//frameworks/opt/net/wifi/service"],

}



// TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp

wifi/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ java_library { 
    },

    hostdex: true, // for hiddenapi check

    visibility: [

        "//frameworks/base", // TODO(b/140299412) remove once all dependencies are fixed

        "//frameworks/opt/net/wifi/service:__subpackages__",

    ] + test_access_hidden_api_whitelist,

    apex_available: [