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

Commit 63834572 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

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



Change-Id: I5f7a9286b8b264d60b054fe46b64ce09ef6855b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39d439c7 6cfb1e3a

api/StubLibraries.bp

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

            tag: ".removed-api.txt",

        },

        },

    ],

    ],

    api_surface: "public",

}

}





priv_apps = " --show-annotation android.annotation.SystemApi\\(" +

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

            tag: ".removed-api.txt",

        },

        },

    ],

    ],

    api_surface: "system",

}

}





droidstubs {

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

            tag: ".removed-api.txt",

        },

        },

    ],

    ],

    api_surface: "test",

}

}





droidstubs {

droidstubs {
@@ -203,6 +206,7 @@ droidstubs { 
            tag: ".removed-api.txt",

            tag: ".removed-api.txt",

        },

        },

    ],

    ],

    api_surface: "module-lib",

}

}





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

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

services/Android.bp

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

            tag: ".removed-api.txt",

        },

        },

    ],

    ],

    api_surface: "system-server",

}
 
}