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

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

Merge "Do not keep runtime invisible annotations in proguard.proguard" into main am: 05527743 

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



Change-Id: Iedd269cda824cafa6ec9f41583931342ccd5613d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f52eb720 05527743

packages/ExtShared/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ android_app { 
    aaptflags: ["--shared-lib"],

    export_package_resources: true,

    optimize: {

        keep_runtime_invisible_annotations: true,

        proguard_flags_files: ["proguard.proguard"],

    },

}

packages/ExtShared/proguard.proguard

+3 −1
Original line number Diff line number Diff line 
-keepparameternames

-keepattributes Exceptions,InnerClasses,Signature,Deprecated,

                SourceFile,LineNumberTable,*Annotation*,EnclosingMethod

                SourceFile,LineNumberTable,EnclosingMethod,

                RuntimeVisibleAnnotations,RuntimeVisibleParameterAnnotations,

                RuntimeVisibleTypeAnnotations,AnnotationDefault



-keep public class * {

    public protected *;