Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108

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

Change-Id: I9eccbf4c8c2b67d2c0c1c5764d853e0e17f538eb
This commit is contained in:
Anton Hansson
2021-10-11 16:43:12 +00:00
committed by Automerger Merge Worker

View File

@@ -430,7 +430,7 @@ genrule {
} }
genrule { genrule {
name: "services-system-server-current.txt", name: "frameworks-base-api-system-server-current.txt",
srcs: [ srcs: [
":service-media-s{.system-server.api.txt}", ":service-media-s{.system-server.api.txt}",
":service-permission{.system-server.api.txt}", ":service-permission{.system-server.api.txt}",
@@ -457,7 +457,7 @@ genrule {
} }
genrule { genrule {
name: "services-system-server-removed.txt", name: "frameworks-base-api-system-server-removed.txt",
srcs: [ srcs: [
":service-media-s{.system-server.removed-api.txt}", ":service-media-s{.system-server.removed-api.txt}",
":service-permission{.system-server.removed-api.txt}", ":service-permission{.system-server.removed-api.txt}",