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

Commit 737529ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392 am: 7cd40212

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6afa3134eec13cd72f777c4f0e33bb579eb58177
parents 6bacac85 7cd40212

wifi/Android.bp

+1 −17
Original line number Original line Diff line number Diff line
@@ -31,9 +31,6 @@ filegroup { 
        "java/**/*.java",

        "java/**/*.java",

        "java/**/*.aidl",

        "java/**/*.aidl",

    ],

    ],

    exclude_srcs: [

        ":framework-wifi-non-updatable-sources"

    ],

    path: "java",

    path: "java",

    visibility: ["//visibility:private"],

    visibility: ["//visibility:private"],

}

}
@@ -46,20 +43,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 {

filegroup {

    name: "framework-wifi-annotations",

    name: "framework-wifi-annotations",

    srcs: ["java/android/net/wifi/WifiAnnotations.java"],

    srcs: ["java/android/net/wifi/WifiAnnotations.java"],
@@ -68,6 +51,7 @@ filegroup { 
// list of tests that are allowed to access @hide APIs from framework-wifi

// list of tests that are allowed to access @hide APIs from framework-wifi

test_access_hidden_api_whitelist = [

test_access_hidden_api_whitelist = [

    "//frameworks/base/wifi/tests",

    "//frameworks/base/wifi/tests",

    "//frameworks/base/wifi/non-updatable/tests",

    "//frameworks/opt/net/wifi/tests/wifitests:__subpackages__",

    "//frameworks/opt/net/wifi/tests/wifitests:__subpackages__",





    "//external/robolectric-shadows:__subpackages__",

    "//external/robolectric-shadows:__subpackages__",

wifi/non-updatable/java/Android.bp

0 → 100644
+35 −0
Original line number Original line 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",

    ],

}