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

Commit 3b0c4f80 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Keep all AIDL generated classes 

Also fix the AIDL class detection.

Test: m framework-minus-apex.ravenwood and make sure IAccountAthenticator
  and its nested classes are all kept.
Test: ./run-all-tests.sh
Change-Id: Idb870a6e7558f7303a2072afbede2a868204e2bf
parent a29375a5

ravenwood/framework-minus-apex-ravenwood-policies.txt

+3 −0
Original line number Diff line number Diff line 
# Ravenwood "policy" file for framework-minus-apex.



# Keep all AIDL interfaces

class :aidl stubclass



# Collections

class android.util.ArrayMap stubclass

class android.util.ArraySet stubclass

tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt

+1 −1
Original line number Diff line number Diff line
@@ -39,5 +39,5 @@ class AndroidHeuristicsFilter( 
private fun ClassNodes.isAidlClass(className: String): Boolean {

    return hasClass(className) &&

            hasClass("$className\$Stub") &&

            hasClass("$className\$Proxy")

            hasClass("$className\$Stub\$Proxy")

}
 
 No newline at end of file

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/01-hoststubgen-test-tiny-framework-orig-dump.txt

+11 −9
Original line number Diff line number Diff line
@@ -223,16 +223,16 @@ RuntimeVisibleAnnotations: 
    java.lang.annotation.Target(

      value=[Ljava/lang/annotation/ElementType;.TYPE,Ljava/lang/annotation/ElementType;.FIELD,Ljava/lang/annotation/ElementType;.METHOD]

    )

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy.class

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy.class

  Compiled from "IPretendingAidl.java"

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy

  minor version: 0

  major version: 61

  flags: (0x0021) ACC_PUBLIC, ACC_SUPER

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

  super_class: #x                         // java/lang/Object

  interfaces: 0, fields: 0, methods: 2, attributes: 3

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy();

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy();

    descriptor: ()V

    flags: (0x0001) ACC_PUBLIC

    Code:
@@ -243,7 +243,7 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy 
      LineNumberTable:

      LocalVariableTable:

        Start  Length  Slot  Name   Signature

            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy;

            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy;



  public static int addTwo(int);

    descriptor: (I)I
@@ -262,7 +262,8 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy 
SourceFile: "IPretendingAidl.java"

NestHost: class com/android/hoststubgen/test/tinyframework/IPretendingAidl

InnerClasses:

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;          // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub.class

  Compiled from "IPretendingAidl.java"

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub
@@ -303,6 +304,7 @@ SourceFile: "IPretendingAidl.java" 
NestHost: class com/android/hoststubgen/test/tinyframework/IPretendingAidl

InnerClasses:

  public static #x= #x of #x;           // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl.class

  Compiled from "IPretendingAidl.java"

public interface com.android.hoststubgen.test.tinyframework.IPretendingAidl
@@ -315,11 +317,11 @@ public interface com.android.hoststubgen.test.tinyframework.IPretendingAidl 
}

SourceFile: "IPretendingAidl.java"

NestMembers:

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

InnerClasses:

  public static #x= #x of #x;            // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;            // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkCallerCheck$Impl.class

  Compiled from "TinyFrameworkCallerCheck.java"

class com.android.hoststubgen.test.tinyframework.TinyFrameworkCallerCheck$Impl

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/02-hoststubgen-test-tiny-framework-host-stub-dump.txt

+10 −8
Original line number Diff line number Diff line 
## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy.class

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy.class

  Compiled from "IPretendingAidl.java"

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy

  minor version: 0

  major version: 61

  flags: (0x0021) ACC_PUBLIC, ACC_SUPER

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

  super_class: #x                         // java/lang/Object

  interfaces: 0, fields: 0, methods: 2, attributes: 4

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy();

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy();

    descriptor: ()V

    flags: (0x0001) ACC_PUBLIC

    Code:
@@ -30,7 +30,8 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy 
         x: athrow

}

InnerClasses:

  public static #x= #x of #x;            // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -71,6 +72,7 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub 
}

InnerClasses:

  public static #x= #x of #x;            // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -89,8 +91,8 @@ public interface com.android.hoststubgen.test.tinyframework.IPretendingAidl 
  interfaces: 0, fields: 0, methods: 0, attributes: 4

}

InnerClasses:

  public static #x= #x of #x;            // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;            // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -98,8 +100,8 @@ RuntimeVisibleAnnotations: 
  x: #x()

    com.android.hoststubgen.hosthelper.HostStubGenProcessedKeepClass

NestMembers:

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkCallerCheck$Impl.class

  Compiled from "TinyFrameworkCallerCheck.java"

class com.android.hoststubgen.test.tinyframework.TinyFrameworkCallerCheck$Impl

tools/hoststubgen/hoststubgen/test-tiny-framework/golden-output/03-hoststubgen-test-tiny-framework-host-impl-dump.txt

+11 −9
Original line number Diff line number Diff line
@@ -205,16 +205,16 @@ RuntimeVisibleAnnotations: 
    java.lang.annotation.Retention(

      value=Ljava/lang/annotation/RetentionPolicy;.CLASS

    )

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy.class

## Class: com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy.class

  Compiled from "IPretendingAidl.java"

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy

public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy

  minor version: 0

  major version: 61

  flags: (0x0021) ACC_PUBLIC, ACC_SUPER

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  this_class: #x                          // com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

  super_class: #x                         // java/lang/Object

  interfaces: 0, fields: 0, methods: 2, attributes: 4

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy();

  public com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub$Proxy();

    descriptor: ()V

    flags: (0x0001) ACC_PUBLIC

    Code:
@@ -225,7 +225,7 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy 
      LineNumberTable:

      LocalVariableTable:

        Start  Length  Slot  Name   Signature

            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy;

            0       5     0  this   Lcom/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy;



  public static int addTwo(int);

    descriptor: (I)I
@@ -242,7 +242,8 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Proxy 
            0       4     0     a   I

}

InnerClasses:

  public static #x= #x of #x;            // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -288,6 +289,7 @@ public class com.android.hoststubgen.test.tinyframework.IPretendingAidl$Stub 
}

InnerClasses:

  public static #x= #x of #x;            // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -306,8 +308,8 @@ public interface com.android.hoststubgen.test.tinyframework.IPretendingAidl 
  interfaces: 0, fields: 0, methods: 0, attributes: 4

}

InnerClasses:

  public static #x= #x of #x;            // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;            // Stub=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub of class com/android/hoststubgen/test/tinyframework/IPretendingAidl

  public static #x= #x of #x;           // Proxy=class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy of class com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

SourceFile: "IPretendingAidl.java"

RuntimeVisibleAnnotations:

  x: #x()
@@ -315,8 +317,8 @@ RuntimeVisibleAnnotations: 
  x: #x()

    com.android.hoststubgen.hosthelper.HostStubGenProcessedKeepClass

NestMembers:

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Proxy

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub

  com/android/hoststubgen/test/tinyframework/IPretendingAidl$Stub$Proxy

## Class: com/android/hoststubgen/test/tinyframework/TinyFrameworkCallerCheck$Impl.class

  Compiled from "TinyFrameworkCallerCheck.java"

class com.android.hoststubgen.test.tinyframework.TinyFrameworkCallerCheck$Impl