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

Commit 400a070f authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Revert "framework.jar - include framework-wifi-stubs instead of framework-wifi""

parents eee174f6 c865b21d

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,8 @@ java_library { 
        "framework-sdkextensions-stubs-systemapi",

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

        "framework-statsd",

        "framework-wifi-stubs",

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

        "framework-wifi",

        "ike-stubs",

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

        "framework-tethering",
@@ -528,8 +529,7 @@ java_library { 
        "compat-changeid-annotation-processor",

    ],

    static_libs: [

        "exoplayer2-core",

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

        "exoplayer2-core"

    ]

}

wifi/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 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: [