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

Commit e8e34302 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "[hoststubgen] Handle lambdas" into main

parents b4fb60f2 cedc08b5

tools/hoststubgen/hoststubgen/annotations-src/android/hosttest/annotation/HostSideTestStaticInitializerStub.java→tools/hoststubgen/hoststubgen/annotations-src/android/hosttest/annotation/HostSideTestStaticInitializerKeep.java

+1 −1
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ import java.lang.annotation.Target; 
 */

@Target({TYPE, FIELD, METHOD, CONSTRUCTOR})

@Retention(RetentionPolicy.CLASS)

public @interface HostSideTestStaticInitializerStub {

public @interface HostSideTestStaticInitializerKeep {

}

tools/hoststubgen/hoststubgen/hoststubgen-standard-options.txt

+2 −2
Original line number Diff line number Diff line
@@ -40,5 +40,5 @@ 
--class-load-hook-annotation

    android.hosttest.annotation.HostSideTestClassLoadHook



--stub-static-initializer-annotation

    android.hosttest.annotation.HostSideTestStaticInitializerStub
 
--keep-static-initializer-annotation

    android.hosttest.annotation.HostSideTestStaticInitializerKeep

tools/hoststubgen/hoststubgen/invoketest/hoststubgen-invoke-test.sh

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ run_hoststubgen() { 
          android.hosttest.annotation.HostSideTestNativeSubstitutionClass \

      --class-load-hook-annotation \

          android.hosttest.annotation.HostSideTestClassLoadHook \

      --stub-static-initializer-annotation \

          android.hosttest.annotation.HostSideTestStaticInitializerStub \

      --keep-static-initializer-annotation \

          android.hosttest.annotation.HostSideTestStaticInitializerKeep \

      $filter_arg \

      |& tee $HOSTSTUBGEN_OUT

  HOSTSTUBGEN_RC=${PIPESTATUS[0]}

tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGen.kt

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ class HostStubGen(val options: HostStubGenOptions) { 
            options.substituteAnnotations,

            options.nativeSubstituteAnnotations,

            options.classLoadHookAnnotations,

            options.stubStaticInitializerAnnotations,

            options.keepStaticInitializerAnnotations,

            annotationAllowedClassesFilter,

            filter,

        )

tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/HostStubGenOptions.kt

+4 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class HostStubGenOptions( 
        var substituteAnnotations: MutableSet<String> = mutableSetOf(),

        var nativeSubstituteAnnotations: MutableSet<String> = mutableSetOf(),

        var classLoadHookAnnotations: MutableSet<String> = mutableSetOf(),

        var stubStaticInitializerAnnotations: MutableSet<String> = mutableSetOf(),

        var keepStaticInitializerAnnotations: MutableSet<String> = mutableSetOf(),



        var packageRedirects: MutableList<Pair<String, String>> = mutableListOf(),
@@ -166,8 +166,8 @@ class HostStubGenOptions( 
                        ret.classLoadHookAnnotations +=

                                ensureUniqueAnnotation(ai.nextArgRequired(arg))



                    "--stub-static-initializer-annotation" ->

                        ret.stubStaticInitializerAnnotations +=

                    "--keep-static-initializer-annotation" ->

                        ret.keepStaticInitializerAnnotations +=

                                ensureUniqueAnnotation(ai.nextArgRequired(arg))



                    "--package-redirect" ->
@@ -318,6 +318,7 @@ class HostStubGenOptions( 
              substituteAnnotations=$substituteAnnotations,

              nativeSubstituteAnnotations=$nativeSubstituteAnnotations,

              classLoadHookAnnotations=$classLoadHookAnnotations,

              keepStaticInitializerAnnotations=$keepStaticInitializerAnnotations,

              packageRedirects=$packageRedirects,

              $annotationAllowedClassesFile=$annotationAllowedClassesFile,

              defaultClassLoadHook=$defaultClassLoadHook,