From b1e859d9c05f4809d6e7b817e2180065467d4995 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Wed, 30 Mar 2022 22:26:41 +0000 Subject: [PATCH] Fix static lib collision between system_server + framework Exclude the static library `android.hardware.contexthub-V1.0-java` from system_server, as it's already included in the framework. This avoids a collision between SYSTEMSERVERCLASSPATH and BOOTCLASSPATH. Bug: 215530220 Bug: 222468116 Change-Id: I7b23bfaba58676702b78e74e95911e03e88eb456 Test: m + atest StrictJavaPackagesTest --- services/core/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/Android.bp b/services/core/Android.bp index 9d190087e300c..b7e39a196bd33 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -154,7 +154,6 @@ java_library_static { "android.hardware.biometrics.fingerprint-V1-java", "android.hardware.oemlock-V1.0-java", "android.hardware.configstore-V1.1-java", - "android.hardware.contexthub-V1.0-java", "android.hardware.ir-V1-java", "android.hardware.rebootescrow-V1-java", "android.hardware.soundtrigger-V2.3-java",