Merge "Replace source based system server stubs" am: e93cf9e566 am: fef2035b4f am: d2a270b4e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642060 Change-Id: I7208c8e14772a8b5ef5c090fb3913973d9350a3a
2021-04-28 20:22:58 +00:00
parent a3a8f663dd d2a270b4e0
commit cfb5663717
3 changed files with 20 additions and 60 deletions
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -370,7 +370,7 @@ genrule {
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system-server/api",
-            dest: "merge-android.txt",
+            dest: "android.txt",
        },
    ],
 }
@@ -394,7 +394,7 @@ genrule {
        {
            targets: ["sdk", "win_sdk"],
            dir: "apistubs/android/system-server/api",
-            dest: "merge-removed.txt",
+            dest: "removed.txt",
        },
    ],
 }