diff options
author | Brian Orr <brianorr@google.com> | 2021-05-13 20:42:01 -0700 |
---|---|---|
committer | Brian Orr <brianorr@google.com> | 2021-05-13 20:42:01 -0700 |
commit | 1b62159ffcebb2c102e129b2e778a8f65b7e5948 (patch) | |
tree | c28571796470b5c9e3d9e8c2dc8d49ddf819fd60 /api | |
parent | 86a43bb54c1ed3c75d072a2c465bf0447b5188c1 (diff) | |
parent | 3a582255fbbf0840208ec8cee02f8401982f0e39 (diff) |
Merge SP1A.210510.001
Change-Id: Ia86f3e18206beabe334e3081cedbaf5b3274f78e
Diffstat (limited to 'api')
-rw-r--r-- | api/Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/Android.bp b/api/Android.bp index 65712704f358..5b733883063a 100644 --- 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", }, ], } |