Merge "SDK Parcelables: @JavaOnlyStableParcelable" into main (c120605d) · Commits · e / os / android_frameworks_base

api/StubLibraries.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -890,7 +890,7 @@ java_genrule {
		cmd: "rm -f $(genDir)/framework.aidl.merged && " +
		"for i in $(in); do " +
		" rm -f $(genDir)/framework.aidl.tmp && " +
		" $(location sdkparcelables) $$i $(genDir)/framework.aidl.tmp && " +
		" $(location sdkparcelables) $$i $(genDir)/framework.aidl.tmp --guarantee_stable && " +
		" cat $(genDir)/framework.aidl.tmp >> $(genDir)/framework.aidl.merged; " +
		"done && " +
		"sort -u $(genDir)/framework.aidl.merged > $(out)",

+12 −1

Original line number	Diff line number	Diff line
		@@ -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")