commit c0ef4b1eb789ad8e71db6b7ccc03c99c2af6fbac
author Matt Buckley <mattbuckley@google.com> Sat Dec 16 00:18:09 2023 +0000
committer Matt Buckley <mattbuckley@google.com> Sat Dec 16 02:25:33 2023 +0000
tree 2088344458ec2de24d39529a06e629082de58579
parent 75d57fa8f7b6610c4d15ff0fdc401ce51b718cdf

Fix dependency issues for PowerHAL FMQ imports

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

services/voiceinteraction/Android.bp

diff --git a/services/voiceinteraction/Android.bp b/services/voiceinteraction/Android.bp
index de8d144..9e425b0 100644
--- a/services/voiceinteraction/Android.bp
+++ b/services/voiceinteraction/Android.bp
@@ -65,12 +65,14 @@
 
 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",
     ],
 }