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

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

Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a am:... 

Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a am: 3a0e798e am: 1b91eb31 am: e00127f1

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

Change-Id: I4a3359e821d32b09459aa36cab4f114870cdbbba
parents 461e6477 e00127f1

tools/sdkparcelables/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ java_binary_host { 
        "src/**/*.kt",

    ],

    static_libs: [

        "asm-6.0",

        "asm-7.0",

    ],

}

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ fun main(args: Array<String>) { 
        kotlin.system.exitProcess(2)

    }



    val ancestorCollector = AncestorCollector(Opcodes.ASM6, null)

    val ancestorCollector = AncestorCollector(Opcodes.ASM7, null)



    for (entry in zipFile.entries()) {

        if (entry.name.endsWith(".class")) {