summaryrefslogtreecommitdiff
path: root/api/Android.bp
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2021-04-28 19:49:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-28 19:49:38 +0000
commitd2a270b4e0d78ce7ebc4727c81052e76ea775fce (patch)
treefb595de3639662a4a1e98d457b20fda75b61a7f4 /api/Android.bp
parentc8fc6f2a1ed07efad32ba1831c12f41fbbb3191d (diff)
parentfef2035b4fccdaf1c96405aa14220bc31bc543c7 (diff)
Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642060 Change-Id: I7cb9f20139da99292954aa42985d1a7fcb1dc78e
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 6e83c083245a..2df31ecb7715 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -341,7 +341,7 @@ genrule {
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system-server/api",
- dest: "merge-android.txt",
+ dest: "android.txt",
},
],
}
@@ -364,7 +364,7 @@ genrule {
{
targets: ["sdk", "win_sdk"],
dir: "apistubs/android/system-server/api",
- dest: "merge-removed.txt",
+ dest: "removed.txt",
},
],
}