commit 332ae5187f76289d9501fe4eeb9705950b271cf6
author Roshan Pius <rpius@google.com> Fri Oct 20 23:53:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 20 23:53:27 2023 +0000
tree bf5d5e0ca903f61e4ca305df1c5234db2f2a187c
parent 55c145b16e19779f0d79326ff93bce167981f3cb
parent ce9b8fa2ad820efbb532e85e0515f8d158925e3b

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

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

Change-Id: Ifaba2fc354d45d293d23cab526376ed735fce740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/Android.bp

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 189ab19..22f8570 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -118,7 +118,6 @@
         ":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",
@@ -131,6 +130,7 @@
         "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",
@@ -179,7 +179,6 @@
         "android.hardware.power.stats-V2-java",
         "android.hardware.power-V4-java",
         "android.hidl.manager-V1.2-java",
-        "android.nfc.flags-aconfig-java",
         "cbor-java",
         "icu4j_calendar_astronomer",
         "android.security.aaid_aidl-java",