Separate out PGO profile files per arch
Bug: http://b/78259283
Specify separate PGO profiles for AArch64/ARM and x86_64/x86. This
allows per-arch profile collection that exercises ART's code generation
for the corresponding 32-bit and 64-bit ABIs.
Test: Build Sailfish and x86_64 targets and verify that corresponding
profile files are read.
Change-Id: I20a04b2d61ce4f33970f1715a62f4b7c28732fa8
Merged-In: I20a04b2d61ce4f33970f1715a62f4b7c28732fa8
(cherry picked from commit 67fa1c7e11686dbcd1b7446f94f1f605cf8793e2)
diff --git a/Android.bp b/Android.bp
index 8f1c4ae..3b2900b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -123,17 +123,15 @@
cc_library {
name: "libvixl-arm64",
- defaults: ["vixl-release", "vixl-arm64"],
+ defaults: [
+ "vixl-release",
+ "vixl-arm64",
+ "dex2oat-pgo-defaults",
+ ],
vendor_available: true,
vndk: {
enabled: true,
},
-
- pgo: {
- instrumentation: true,
- profile_file: "art/dex2oat.profdata",
- benchmarks: ["dex2oat"],
- }
}
cc_library {
@@ -143,17 +141,15 @@
cc_library {
name: "libvixl-arm",
- defaults: ["vixl-release", "vixl-arm"],
+ defaults: [
+ "vixl-release",
+ "vixl-arm",
+ "dex2oat-pgo-defaults",
+ ],
vendor_available: true,
vndk: {
enabled: true,
},
-
- pgo: {
- instrumentation: true,
- profile_file: "art/dex2oat.profdata",
- benchmarks: ["dex2oat"],
- }
}
cc_library {