summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roshan Pius <rpius@google.com> 2023-10-21 00:09:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-21 00:09:22 +0000
commit295efdeaa2352bb386ee558fecdcff6d3ac0b3b4 (patch)
tree78226c755f4889ae79941aeece5327f4a6fa5d88
parent49f3b15e1ee7913c1212ac23d072e4ac937c0b05 (diff)
parent058b2555f56eb170d09edf8edf26ebdb35763227 (diff)
Merge "services: Dont statically include classes in bootclasspath" into main am: ce9b8fa2ad am: 058b2555f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798518 Change-Id: Ia06663e64f162870b111976e21b9a9fd7535f28e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/Android.bp3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 189ab19763ac..22f85703f428 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -118,7 +118,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",
@@ -131,6 +130,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",
@@ -179,7 +179,6 @@ java_library_static {
"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",