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

Commit 18a79c5a authored by Matt Gilbride's avatar Matt Gilbride
Browse files

Add `art-profile-extra` for manual profile entries

Creates a new file and corresponding genrule to combine it with the main
`art-profile` for system services. `art-profile` is maintained by
automated tooling, but we now have at least one case
(`CtsDynamicInstrumentationManagerTest`) that relies on certain code in
system server being AOT compiled. It is also considered generally useful
to have a way to add entries manually, independent of automated tooling.

`art-profile-extra` is created so we can maintain those manual entries.
The `art-profile-combined` genrule concatenates `art-profile` and
`art-profile-extra` into one file for use by ART to execute AOT
compilation.

The current entry
`ActivityManagerService$LocalService->checkContentProviderAccess` is
referenced by `CtsDynamicInstrumentationManagerTest`. Said method is
redundant with `art-profile`, but putting it in `-extra` prevents said
automated tooling fom potentially breaking a CTS test.

Bug: 333751994
Test: TH
Flag: EXEMPT no behavior change intended
Change-Id: I1ef9739afc24765f760ba566b95064eca2ef74a4
parent 40ed1d02
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ art_profile_java_defaults {
            conditions_default: {
                dex_preopt: {
                    app_image: true,
                    profile: "art-profile",
                    profile: ":art-profile-combined",
                },
            },
        },
@@ -391,9 +391,14 @@ platform_compat_config {
    src: ":services",
}

filegroup {
    name: "art-profile",
    srcs: ["art-profile"],
genrule {
    name: "art-profile-combined",
    srcs: [
        "art-profile",
        "art-profile-extra",
    ],
    out: ["art-profile-combined"],
    cmd: "cat $(location art-profile) $(location art-profile-extra) > $(location art-profile-combined)",
}

// API stub
+1 −0
Original line number Diff line number Diff line
HSPLcom/android/server/am/ActivityManagerService$LocalService;->checkContentProviderAccess(Ljava/lang/String;I)Ljava/lang/String;