Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b69ecc authored by Steven Moreland's avatar Steven Moreland
Browse files

SDK Parcelables: @JavaOnlyStableParcelable 

Now that androidx is using these more for SDK sandbox and usage
of stable AIDL is generally on the rise, go ahead and mark all
platform Parcelables as stable.

This is okay because all apps will share their definition from the
common BCP. If this is ever used on Parcelables not on the common
BCP, that may cause version mismatch and break usage of stable
AIDL that uses these interfaces.

Bug: 258850063
Test: build
Change-Id: Iba43040beda379f0735adf1af319a1dbfce99447
parent a35b1f13

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)",

tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt

+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")