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

Commit 439175f1 authored by David Su's avatar David Su
Browse files

Build framework-wifi against core_current & framework-system-stubs (Attempt 2) 

At this point framework-wifi will not depend on
any @hide APIs.

Previous attempt broke git_master/apps target.

Bug: 140299412
Change-Id: Idf4c1d22f96c01ae9c117742dcfe83929ab545ae
Test: boots up and connects to Wifi
parent 32f3943b

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ java_library { 
        "//frameworks/base/apex/permission/framework",

        "//frameworks/base/apex/statsd/service",

        "//frameworks/base/telephony",

        "//frameworks/base/wifi",

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

    ],

}

wifi/Android.bp

+15 −6
Original line number Diff line number Diff line
@@ -58,19 +58,20 @@ test_access_hidden_api_whitelist = [ 
// classes before they are renamed.

java_library {

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

    // TODO(b/140299412) should be core_current once we build against framework-system-stubs

    sdk_version: "core_platform",

    // TODO(b/146757305): sdk_version should be "module_lib_current"

    sdk_version: "core_current",

    static_libs: [

        "framework-wifi-util-lib",

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

    ],

    libs: [

        // TODO(b/140299412) should be framework-system-stubs once we fix all @hide dependencies

        "framework-minus-apex",

        "framework-annotations-lib",

        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage

        "unsupportedappusage-annotation", // for dalvik.annotation.compat.UnsupportedAppUsage

        "framework-telephony-stubs",

        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current"

        "android_system_stubs_current",

    ],

    srcs: [

        ":framework-wifi-updatable-sources",
@@ -80,13 +81,21 @@ java_library { 
        "//frameworks/opt/net/wifi/service",

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

    ],



    // TODO(b/146757305): should be unnecessary once

    // sdk_version="module_lib_current"

    aidl: {

        include_dirs: [

            "frameworks/base/core/java",

        ],

    },

}



// post-jarjar version of framework-wifi

java_library {

    name: "framework-wifi",

    // TODO(b/140299412) should be core_current once we build against framework-system-stubs

    sdk_version: "core_platform",

    // TODO(b/146757305): sdk_version should be "module_lib_current"

    sdk_version: "core_current",

    static_libs: [

        "framework-wifi-pre-jarjar",

    ],