Fix dependency issues for PowerHAL FMQ imports
Bug: b/316620445
Test: atest CtsStrictJavaPackagesTestCases android.compat.sjp.cts.StrictJavaPackagesTest#testBootClasspathAndSystemServerClasspath_nonDuplicateClasses
Change-Id: Ia7aa29637799c380b4a8d6185b25ba107f016d97
diff --git a/Android.bp b/Android.bp
index 676a0f5..91f03e003 100644
--- a/Android.bp
+++ b/Android.bp
@@ -206,6 +206,9 @@
// 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 a0ccbf3..7bce3b7 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -100,7 +100,7 @@
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 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",
],
}