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

Commit a17f6b8d authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "remove_api_files", "remove_naming_convention" into... 

Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 901eda31 am: 8816bd35 am: 9dced33f am: 6cfb1e3a am: 63834572

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



Change-Id: Ida57ba37bfa39a4ef168fb45242c4de284fdf501
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e168964 63834572

api/StubLibraries.bp

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "public",

}



priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
@@ -120,6 +121,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "system",

}



droidstubs {
@@ -166,6 +168,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "test",

}



droidstubs {
@@ -205,6 +208,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "module-lib",

}



/////////////////////////////////////////////////////////////////////

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -277,4 +277,5 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "system-server",

}