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

Commit ebd2e94a authored by David Su's avatar David Su Committed by Automerger Merge Worker
Browse files

Merge "framework-wifi & OsuLogin: set min & target SDK version to 30" into... 

Merge "framework-wifi & OsuLogin: set min & target SDK version to 30" into rvc-dev am: e640bbf9 am: 4a911607

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

Change-Id: If84e5ac265c81f8890cc5cfd988eece4093e8895
parents 672a7f1c 4a911607

packages/OsuLogin/Android.bp

+1 −0
Original line number Diff line number Diff line 
android_app {

    name: "OsuLogin",

    defaults: ["wifi-module-sdk-version-defaults"],

    static_libs: ["androidx.legacy_legacy-support-v4"],

    resource_dirs: ["res"],

    srcs: ["src/**/*.java"],

wifi/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



java_defaults {

    name: "wifi-module-sdk-version-defaults",

    min_sdk_version: "30",

    target_sdk_version: "30",

}



filegroup {

    name: "framework-wifi-updatable-exported-aidl-sources",

    srcs: ["aidl-export/**/*.aidl"],
@@ -73,6 +79,7 @@ test_access_hidden_api_whitelist = [ 
// classes before they are renamed.

java_library {

    name: "framework-wifi-pre-jarjar",

    defaults: ["wifi-module-sdk-version-defaults"],

    sdk_version: "module_current",

    static_libs: [

        "framework-wifi-util-lib",
@@ -98,7 +105,10 @@ java_library { 
// post-jarjar version of framework-wifi

java_sdk_library {

    name: "framework-wifi",

    defaults: ["framework-module-defaults"],

    defaults: [

        "framework-module-defaults",

        "wifi-module-sdk-version-defaults",

    ],

    static_libs: [

        "framework-wifi-util-lib",

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