summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Gilbride <mattgilbride@google.com> 2025-03-19 06:52:32 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-19 06:52:32 -0700
commit8c959e5eb40de606caf263a79bd8b83aa0246296 (patch)
treec99fcf3392c7b3cf4df486830bae0dd39625067a
parentdb8d867809dc9485ae92eeda1ffff23f50fec127 (diff)
parent18a79c5a0f7da462e64162b0d9ba1ef99d8f1a5f (diff)
Merge "Add `art-profile-extra` for manual profile entries" into main
-rw-r--r--services/Android.bp13
-rw-r--r--services/art-profile-extra1
2 files changed, 10 insertions, 4 deletions
diff --git a/services/Android.bp b/services/Android.bp
index efd35ce8f1a3..8657bfc79316 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -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
diff --git a/services/art-profile-extra b/services/art-profile-extra
new file mode 100644
index 000000000000..54362411e5ea
--- /dev/null
+++ b/services/art-profile-extra
@@ -0,0 +1 @@
+HSPLcom/android/server/am/ActivityManagerService$LocalService;->checkContentProviderAccess(Ljava/lang/String;I)Ljava/lang/String;