summaryrefslogtreecommitdiff
path: root/api/Android.bp
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2021-10-11 17:03:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-11 17:03:50 +0000
commitcedf8bade74bdb2cb7f0e6bcd05a5becfb28251f (patch)
tree40b7341eece8148d023eb2a41c59ca50bd3c1d82 /api/Android.bp
parent3867fd437bae3e60bc2ce19ae7ab2676b2326a66 (diff)
parent7fafe71ffce83318237f806c540b2cf9c8167842 (diff)
Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108 am: 2e4629a729 am: 7fafe71ffc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850198 Change-Id: Id0eba8d4c25a84c39e767d4738534880d422523e
Diffstat (limited to 'api/Android.bp')
-rw-r--r--api/Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/Android.bp b/api/Android.bp
index dbb81a6cb21c..7590177fe225 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -437,7 +437,7 @@ genrule {
}
genrule {
- name: "services-system-server-current.txt",
+ name: "frameworks-base-api-system-server-current.txt",
srcs: [
":service-media-s{.system-server.api.txt}",
":service-permission{.system-server.api.txt}",
@@ -464,7 +464,7 @@ genrule {
}
genrule {
- name: "services-system-server-removed.txt",
+ name: "frameworks-base-api-system-server-removed.txt",
srcs: [
":service-media-s{.system-server.removed-api.txt}",
":service-permission{.system-server.removed-api.txt}",