diff options
| author | 2023-12-16 00:18:09 +0000 | |
|---|---|---|
| committer | 2023-12-16 02:25:33 +0000 | |
| commit | c0ef4b1eb789ad8e71db6b7ccc03c99c2af6fbac (patch) | |
| tree | 2088344458ec2de24d39529a06e629082de58579 | |
| parent | 75d57fa8f7b6610c4d15ff0fdc401ce51b718cdf (diff) | |
Fix dependency issues for PowerHAL FMQ imports
Bug: b/316620445
Test: atest CtsStrictJavaPackagesTestCases android.compat.sjp.cts.StrictJavaPackagesTest#testBootClasspathAndSystemServerClasspath_nonDuplicateClasses
Change-Id: Ia7aa29637799c380b4a8d6185b25ba107f016d97
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | services/core/Android.bp | 2 | ||||
| -rw-r--r-- | services/voiceinteraction/Android.bp | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 676a0f51d3f6..91f03e0036a3 100644 --- a/Android.bp +++ b/Android.bp @@ -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", diff --git a/services/core/Android.bp b/services/core/Android.bp index a0ccbf3acf0a..7bce3b7a81aa 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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", diff --git a/services/voiceinteraction/Android.bp b/services/voiceinteraction/Android.bp index de8d1440e6ac..9e425b0420f3 100644 --- a/services/voiceinteraction/Android.bp +++ b/services/voiceinteraction/Android.bp @@ -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", ], } |