summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-08-26 21:29:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-26 21:29:22 +0000
commit62a7402d2bc325dc6be53bbe83e5e8e68707493f (patch)
tree9822900e152aacb5d3c58b4a39d1c597fb3b2210 /tools
parentef1359f8f614f2fed9766600bbc0b7421f7a69f4 (diff)
parentc120605de6da039884f6b3a79140d091c9a503aa (diff)
Merge "SDK Parcelables: @JavaOnlyStableParcelable" into main am: c120605de6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3216070 Change-Id: I8c40b853f65915888b757730faad7703e1ad209f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt13
1 files changed, 12 insertions, 1 deletions
diff --git a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
index 0b619488c49c..9c443324defb 100644
--- a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
+++ b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt
@@ -23,13 +23,21 @@ import java.io.IOException
import java.util.zip.ZipFile
fun main(args: Array<String>) {
- if (args.size != 2) {
+ if (args.size < 2 || args.size > 3) {
usage()
}
val zipFileName = args[0]
val aidlFileName = args[1]
+ var stable = false
+ if (args.size == 3) {
+ if (args[2] != "--guarantee_stable") {
+ usage()
+ }
+ stable = true
+ }
+
val zipFile: ZipFile
try {
@@ -55,6 +63,9 @@ fun main(args: Array<String>) {
val outFile = File(aidlFileName)
val outWriter = outFile.bufferedWriter()
for (parcelable in parcelables) {
+ if (stable) {
+ outWriter.write("@JavaOnlyStableParcelable ")
+ }
outWriter.write("parcelable ")
outWriter.write(parcelable.replace('/', '.').replace('$', '.'))
outWriter.write(";\n")