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

Commit c0ef4b1e authored by Matt Buckley's avatar Matt Buckley
Browse files

Fix dependency issues for PowerHAL FMQ imports 

Bug: b/316620445
Test: atest CtsStrictJavaPackagesTestCases android.compat.sjp.cts.StrictJavaPackagesTest#testBootClasspathAndSystemServerClasspath_nonDuplicateClasses
Change-Id: Ia7aa29637799c380b4a8d6185b25ba107f016d97
parent 75d57fa8

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ java_defaults { 
// framework_srcs. These have no or very limited dependency to the framework.

java_library {

    name: "framework-internal-utils",

    defaults: [

        "android.hardware.power-java_static",

    ],

    static_libs: [

        "apex_aidl_interface-java",

        "packagemanager_aidl-java",

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ java_library_static { 
    name: "services.core.unboosted",

    defaults: [

        "platform_service_defaults",

        "android.hardware.power-java_static",

        "android.hardware.power-java_shared",

    ],

    srcs: [

        ":android.hardware.biometrics.face-V4-java-source",

services/voiceinteraction/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -65,12 +65,14 @@ java_library_static { 


java_library_static {

    name: "services.voiceinteraction",

    defaults: ["platform_service_defaults"],

    defaults: [

        "platform_service_defaults",

        "android.hardware.power-java_shared",

    ],

    srcs: [":services.voiceinteraction-sources"],

    libs: [

        "services.core",

        "app-compat-annotations",

        "android.hardware.power-V1-java",

        "android.hardware.power-V1.0-java",

    ],

}