Merge "Fix static lib collision between system_server + framework" am: a6f4bbd418

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050305

Change-Id: I00e1ae911b097b894083f9ba55a9ad3c45fb797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jared Duke
2022-03-31 23:06:02 +00:00
committed by Automerger Merge Worker

View File

@@ -154,7 +154,6 @@ java_library_static {
"android.hardware.biometrics.fingerprint-V1-java", "android.hardware.biometrics.fingerprint-V1-java",
"android.hardware.oemlock-V1.0-java", "android.hardware.oemlock-V1.0-java",
"android.hardware.configstore-V1.1-java", "android.hardware.configstore-V1.1-java",
"android.hardware.contexthub-V1.0-java",
"android.hardware.ir-V1-java", "android.hardware.ir-V1-java",
"android.hardware.rebootescrow-V1-java", "android.hardware.rebootescrow-V1-java",
"android.hardware.soundtrigger-V2.3-java", "android.hardware.soundtrigger-V2.3-java",