Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4663b75d authored by Jared Duke's avatar Jared Duke Committed by Automerger Merge Worker
Browse files

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

Merge "Fix static lib collision between system_server + framework" am: a6f4bbd4 am: e9c76893 am: 84960032 am: 2974e295 am: e1a56179

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



Change-Id: I144caad0d0e1911d240eb598b9e6f81048257089
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5a6c471 e1a56179

services/core/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,6 @@ java_library_static { 
        "android.hardware.biometrics.fingerprint-V2-java",

        "android.hardware.biometrics.fingerprint-V2-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",