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

Commit b28aa9aa authored by Aleksei Vetrov's avatar Aleksei Vetrov
Browse files

Make framework-virtualization APIs available for framework 

Add framework-virtualization.impl as dependency for framework-minus-apex
to be able to use any AVF API from framework code.

The framework-virtualization belongs to a non-updatable module and is
already listed in frameworks/base/api/api.go, however it was not part of
framework-non-updatable-unbundled-impl-libs because it would have
introduce a circular dependency. It has been resolved by using
framework-non-updatable-unbundled-defaults, which makes
framework-virtualization depend on framework-minus-apex-headers instead.

This also requires framework-non-updatable-unbundled-defaults and
framework-minus-apex-headers to be visible to Virtualization module.

Bug: 410851667
Test: TH
Flag: EXEMPT refactor
Change-Id: Ife7d529b352ceea2998b5736f1fa25acecff08da
parent 859c6c2c

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ java_library { 
    name: "framework-non-updatable-unbundled-impl-libs",

    static_libs: [

        "framework-location.impl",

        "framework-virtualization.impl",

    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {

        "true": [],

        default: [
@@ -456,7 +457,6 @@ java_defaults { 
    name: "framework-minus-apex-with-libs-defaults",

    defaults: ["framework-minus-apex-defaults"],

    libs: [

        "framework-virtualization.stubs.module_lib",

        "framework-non-updatable-unbundled-impl-libs",

    ],

}
@@ -492,6 +492,7 @@ java_library { 
        "//packages/modules/NeuralNetworks:__subpackages__",

        // TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE

        "//packages/modules/Telephony/framework:__subpackages__",

        "//packages/modules/Virtualization:__subpackages__",

    ],

    compile_dex: false,

    headers_only: true,

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ java_defaults { 
        "//packages/modules/NeuralNetworks:__subpackages__",

        // TODO(b/429127828): Clean this up along with RELEASE_TELEPHONY_MODULE

        "//packages/modules/Telephony/framework:__subpackages__",

        "//packages/modules/Virtualization:__subpackages__",

    ],

    plugins: ["error_prone_android_framework"],

    errorprone: {