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

Commit 060d8692 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "services: Dont statically include classes in bootclasspath" into main...

Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2 am: 058b2555 am: 295efdea

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



Change-Id: I4b74592796ac61232a8359e90a709ea4c8226a07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9dd18822 295efdea
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ java_library_static {
        ":display-device-config",
        ":display-layout-config",
        ":device-state-config",
        ":framework-core-nfc-infcadapter-sources",
        "java/com/android/server/EventLogTags.logtags",
        "java/com/android/server/am/EventLogTags.logtags",
        "java/com/android/server/wm/EventLogTags.logtags",
@@ -149,6 +148,7 @@ java_library_static {
        "android.hardware.light-V2.0-java",
        "android.hardware.gnss-V2-java",
        "android.hardware.vibrator-V2-java",
        "android.nfc.flags-aconfig-java",
        "app-compat-annotations",
        "framework-tethering.stubs.module_lib",
        "service-art.stubs.system_server",
@@ -196,7 +196,6 @@ java_library_static {
        "android.hardware.rebootescrow-V1-java",
        "android.hardware.power.stats-V2-java",
        "android.hidl.manager-V1.2-java",
        "android.nfc.flags-aconfig-java",
        "cbor-java",
        "icu4j_calendar_astronomer",
        "android.security.aaid_aidl-java",