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

Commit 15273536 authored by Anton Hansson's avatar Anton Hansson
Browse files

Put sdk_version in module stub defaults 

Makes it easier to change when every module isn't specifying
how the stubs are built.

Also make wifi stubs build against the appropriate api surface, which
works around a bug.

Bug: 147768409
Bug: 151134996
Test: m
Change-Id: I91db06ef932a73002b4fe232566f5d111baef432
parent 7e863266

apex/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ stubs_defaults { 
    name: "framework-module-stubs-defaults-publicapi",

    args: mainline_stubs_args,

    installable: false,

    sdk_version: "current",

}



stubs_defaults {
@@ -50,6 +51,7 @@ stubs_defaults { 
    args: mainline_stubs_args + priv_apps,

    srcs: [":framework-annotations"],

    installable: false,

    sdk_version: "system_current",

}



// The defaults for module_libs comes in two parts - defaults for API checks
@@ -62,6 +64,7 @@ stubs_defaults { 
    args: mainline_stubs_args + module_libs,

    srcs: [":framework-annotations"],

    installable: false,

    sdk_version: "module_current",

}



stubs_defaults {
@@ -69,4 +72,5 @@ stubs_defaults { 
    args: mainline_stubs_args + module_libs + priv_apps,

    srcs: [":framework-annotations"],

    installable: false,

    sdk_version: "module_current",

}

wifi/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -177,14 +177,14 @@ droidstubs { 
java_library {

    name: "framework-wifi-stubs-publicapi",

    srcs: [":framework-wifi-stubs-srcs-publicapi"],

    sdk_version: "module_current",

    sdk_version: "current",

    installable: false,

}



java_library {

    name: "framework-wifi-stubs-systemapi",

    srcs: [":framework-wifi-stubs-srcs-systemapi"],

    sdk_version: "module_current",

    sdk_version: "system_current",

    libs: ["framework-annotations-lib"],

    installable: false,

}