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

Android.bp

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",