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

Commit 2c836346 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SDK Parcelables: @JavaOnlyStableParcelable" into main am: c120605d am: 62a7402d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3216070



Change-Id: I3d5c16119507e80ca40a37285c931043dd004465
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f667c4e 62a7402d

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