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

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

Merge "Split updatable/non-updatable Wifi APIs into separate directories"

parents 2f1258d2 e7cc3ae6
Loading
Loading
Loading
Loading
+1 −17
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ filegroup {
        "java/**/*.java",
        "java/**/*.aidl",
    ],
    exclude_srcs: [
        ":framework-wifi-non-updatable-sources"
    ],
    path: "java",
    visibility: ["//visibility:private"],
}
@@ -47,20 +44,6 @@ filegroup {
    ],
}

filegroup {
    name: "framework-wifi-non-updatable-sources",
    srcs: [
        // TODO(b/146011398) package android.net.wifi is now split amongst 2 jars: framework.jar and
        // framework-wifi.jar. This is not a good idea, should move WifiNetworkScoreCache
        // to a separate package.
        "java/android/net/wifi/SoftApConfToXmlMigrationUtil.java",
        "java/android/net/wifi/WifiNetworkScoreCache.java",
        "java/android/net/wifi/WifiMigration.java",
        "java/android/net/wifi/nl80211/*.java",
        ":libwificond_ipc_aidl",
    ],
}

filegroup {
    name: "framework-wifi-annotations",
    srcs: ["java/android/net/wifi/WifiAnnotations.java"],
@@ -69,6 +52,7 @@ filegroup {
// list of tests that are allowed to access @hide APIs from framework-wifi
test_access_hidden_api_whitelist = [
    "//frameworks/base/wifi/tests",
    "//frameworks/base/wifi/non-updatable/tests",
    "//frameworks/opt/net/wifi/tests/wifitests:__subpackages__",

    "//external/robolectric-shadows:__subpackages__",
+35 −0
Original line number Diff line number Diff line
// Copyright (C) 2020 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This directory contains framework Wifi APIs that are not part of the Wifi module (i.e. not
// updatable), and are generally only called by the Wifi module.

// necessary since we only want the `path` property to only refer to these files
filegroup {
    name: "framework-wifi-non-updatable-sources-internal",
    srcs: ["src/**/*.java"],
    path: "src",
    visibility: ["//visibility:private"],
}

filegroup {
    name: "framework-wifi-non-updatable-sources",
    srcs: [
        // TODO(b/146011398) package android.net.wifi is now split amongst 2 jars: framework.jar and
        // framework-wifi.jar. This is not a good idea, should move WifiNetworkScoreCache
        // to a separate package.
        ":framework-wifi-non-updatable-sources-internal",
        ":libwificond_ipc_aidl",
    ],
}
Loading