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

Commit 13fa9fc5 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix "supported" label of renaming methods 

ApiDumper needs to do the "access" bit inheritance too for @Replace
methods.

Fix: 436862019

Flag: TEST_ONLY
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -r
Change-Id: I4f5e3c500a34b759bbc841d9e78afc579205cfaf
parent 8cfa9f97

ravenwood/tools/hoststubgen/test-tiny-framework/golden-output/hoststubgen-test-tiny-framework-stats.txt

+4 −4
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ com.android.hoststubgen.test.tinyframework 
  1

  Keep

  annotation

  1

  1

  0

  2

com.android.hoststubgen.test.tinyframework

  TinyFrameworkAnnotations

  0
@@ -359,8 +359,8 @@ com.android.hoststubgen.test.tinyframework 
  1

  Keep

  annotation

  1

  1

  0

  2

com.android.hoststubgen.test.tinyframework

  TinyFrameworkExperimental

  0

ravenwood/tools/ravenhelper/src/com/android/platform/test/ravenwood/ravenhelper/stats/ApiDumper.kt

+32 −9
Original line number Diff line number Diff line
@@ -15,13 +15,12 @@ 
 */

package com.android.platform.test.ravenwood.ravenhelper.stats



import com.android.hoststubgen.HostStubGenErrors

import com.android.hoststubgen.asm.CLASS_INITIALIZER_NAME

import com.android.hoststubgen.asm.CTOR_NAME

import com.android.hoststubgen.asm.ClassNodes

import com.android.hoststubgen.asm.getClassNameFromFullClassName

import com.android.hoststubgen.asm.getPackageNameFromFullClassName

import com.android.hoststubgen.asm.isAbstract

import com.android.hoststubgen.asm.isPublic

import com.android.hoststubgen.asm.toHumanReadableClassName

import com.android.hoststubgen.csvEscape

import com.android.hoststubgen.filters.FilterPolicy
@@ -29,8 +28,9 @@ import com.android.hoststubgen.filters.FilterPolicyWithReason 
import com.android.hoststubgen.filters.OutputFilter

import com.android.hoststubgen.filters.StatsLabel

import com.android.hoststubgen.log

import com.android.hoststubgen.visitors.checkSubstitutionMethodCompatibility

import org.objectweb.asm.Opcodes

import org.objectweb.asm.tree.ClassNode

import org.objectweb.asm.tree.MethodNode

import java.io.PrintWriter



/**
@@ -41,6 +41,7 @@ class ApiDumper( 
    val classes: ClassNodes,

    val frameworkClasses: ClassNodes?,

    val filter: OutputFilter,

    val errors: HostStubGenErrors,

) {

    private data class MethodKey(

        val name: String,
@@ -113,7 +114,8 @@ class ApiDumper( 
    }



    private fun resolveMethodLabel(

        mn: MethodNode,

        methodName: String,

        methodAccess: Int,

        methodPolicy: FilterPolicyWithReason,

        classLabel: StatsLabel,

    ): StatsLabel {
@@ -127,7 +129,8 @@ class ApiDumper( 
        }



        // Use heuristics to override the label.

        if (!mn.isPublic()) {

        if ((methodAccess and Opcodes.ACC_PUBLIC) == 0) {

            // If it's not public, mark it as "boring".

            return StatsLabel.SupportedButBoring

        }
@@ -139,14 +142,14 @@ class ApiDumper( 
            return StatsLabel.Supported

        }



        if (mn.isAbstract()) {

        if ((methodAccess and Opcodes.ACC_ABSTRACT) != 0) {

            // An abstract method is normally boring -- but if it's a throw-but-interesting,

            // that's actually not boring.

            // that's actually not boring. So this check has to be after the other checks.

            return StatsLabel.SupportedButBoring

        }



        // Mark ctors and clinits as boring.

        when (mn.name) {

        when (methodName) {

            CTOR_NAME, CLASS_INITIALIZER_NAME -> return StatsLabel.SupportedButBoring

        }
@@ -199,7 +202,27 @@ class ApiDumper( 


            val renameTo = filter.getRenameTo(methodClass.name, method.name, method.desc)



            val methodLabel = resolveMethodLabel(method, methodPolicy, classLabel)

            // The method's "access" bits affect the "method label". But if we're renaming a method,

            // we need to use rename-to's access bits.

            val methodAccess = if (renameTo == null) {

                method.access

            } else {

                checkSubstitutionMethodCompatibility(

                    classes,

                    methodClass.name,

                    renameTo, // method name with the annotation.

                    method.name, // the current method (i.e. `*$ravenwood`).

                    method.desc,

                    errors

                )

            }



            val methodLabel = resolveMethodLabel(

                method.name,

                methodAccess,

                methodPolicy,

                classLabel,

            )



            if (methodLabel != StatsLabel.Ignored) {

                dumpMethod(pkg, cls, isSuperClass, methodClass.name.toHumanReadableClassName(),

ravenwood/tools/ravenhelper/src/com/android/platform/test/ravenwood/ravenhelper/stats/StatsHandler.kt

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.platform.test.ravenwood.ravenhelper.stats



import com.android.hoststubgen.HostStubGenClassProcessor

import com.android.hoststubgen.HostStubGenErrors

import com.android.hoststubgen.asm.ClassNodes

import com.android.hoststubgen.filters.printAsTextPolicy

import com.android.hoststubgen.log
@@ -29,6 +30,8 @@ class StatsHandler : SubcommandHandler { 
        val options = StatsOptions().apply { parseArgs(args) }

        log.i("Options: $options")



        val errors = HostStubGenErrors()



        val inJar = ConcurrentZipFile(options.inJar.get, DEFAULT_SHARD_COUNT)



        // Load all classes.
@@ -58,7 +61,7 @@ class StatsHandler : SubcommandHandler { 
                PrintWriter(it).use { pw ->

                    // TODO, when dumping a jar that's not framework-minus-apex.jar, we need to feed

                    // framework-minus-apex.jar so that we can dump inherited methods from it.

                    ApiDumper(pw, allClasses, null, filter).dump()

                    ApiDumper(pw, allClasses, null, filter, errors).dump()

                }

            }

        }