Snap for 13210474 from 2214733637c060ad7260a1048f969cd002944080 to 25Q2-release

Change-Id: Id72e17d81d4a9946ce1c15718efd2b362e8424e8

AFDO_SUMMARY.txt

diff --git a/AFDO_SUMMARY.txt b/AFDO_SUMMARY.txt
index d4dd30e..3416f7d 100644
--- a/AFDO_SUMMARY.txt
+++ b/AFDO_SUMMARY.txt
@@ -336,6 +336,26 @@
 android::VectorImpl::editArrayImpl()
 
 
+sampling/libz_arm64.afdo
+====
+longest_match(internal_state*, unsigned int) (.__uniq.846982182549687996375565254981381303)
+deflate_slow(internal_state*, int) (.__uniq.846982182549687996375565254981381303)
+inflate_fast
+build_tree(internal_state*, tree_desc_s*) (.__uniq.177060090991000879816580501745395732528)
+compress_block(internal_state*, ct_data_s const*, ct_data_s const*) (.__uniq.177060090991000879816580501745395732528)
+inflate
+inflate_table
+fill_window(internal_state*) (.__uniq.846982182549687996375565254981381303)
+deflate_fast(internal_state*, int) (.__uniq.846982182549687996375565254981381303)
+adler32_simd_
+_tr_flush_block
+send_tree(internal_state*, ct_data_s*, int) (.__uniq.177060090991000879816580501745395732528)
+armv8_crc32_pmull_little
+init_block(internal_state*) (.__uniq.177060090991000879816580501745395732528)
+adler32_z
+crc32_combine
+
+
 sampling/linker_arm64.afdo
 ====
 elf64_sym const* soinfo_do_lookup_impl<false>(char const*, version_info const*, soinfo**, SymbolLookupList const&) (.__uniq.331521225453620004837736674378903349473)

sampling/Android.bp

diff --git a/sampling/Android.bp b/sampling/Android.bp
index b298de6..03f5897 100644
--- a/sampling/Android.bp
+++ b/sampling/Android.bp
@@ -137,6 +137,16 @@
 }
 
 fdo_profile {
+    name: "libz",
+    native_bridge_supported: true,
+    arch: {
+        arm64: {
+            profile: "libz_arm64.afdo",
+        },
+    },
+}
+
+fdo_profile {
     name: "server_configurable_flags",
     profile: "server_configurable_flags.afdo",
 }

sampling/afdo_profiles.mk

diff --git a/sampling/afdo_profiles.mk b/sampling/afdo_profiles.mk
index b30bbac..e77b216 100644
--- a/sampling/afdo_profiles.mk
+++ b/sampling/afdo_profiles.mk
@@ -3,21 +3,22 @@
 # AFDO_PROFILES is applied to all products while PRODUCT_AFDO_PROFILES, which is set
 # in a product config, has the ability to override it with custom profile
 AFDO_PROFILES += keystore2://toolchain/pgo-profiles/sampling:keystore2 \
+	libart://toolchain/pgo-profiles/sampling:libart \
+	libartbase://toolchain/pgo-profiles/sampling:libartbase \
 	libbinder://toolchain/pgo-profiles/sampling:libbinder \
 	libbinder_ndk://toolchain/pgo-profiles/sampling:libbinder_ndk \
+	libcrypto://toolchain/pgo-profiles/sampling:libcrypto \
 	libgui://toolchain/pgo-profiles/sampling:libgui \
 	libhidlbase://toolchain/pgo-profiles/sampling:libhidlbase \
 	libhwui://toolchain/pgo-profiles/sampling:libhwui \
 	libjpeg://toolchain/pgo-profiles/sampling:libjpeg \
 	liblog://toolchain/pgo-profiles/sampling:liblog \
 	libsensorservice://toolchain/pgo-profiles/sampling:libsensorservice \
+	libsqlite://toolchain/pgo-profiles/sampling:libsqlite \
 	libui://toolchain/pgo-profiles/sampling:libui \
 	libutils://toolchain/pgo-profiles/sampling:libutils \
-	lmkd://toolchain/pgo-profiles/sampling:lmkd \
-	surfaceflinger://toolchain/pgo-profiles/sampling:surfaceflinger \
-	libart://toolchain/pgo-profiles/sampling:libart \
-	libartbase://toolchain/pgo-profiles/sampling:libartbase \
+	libz://toolchain/pgo-profiles/sampling:libz \
 	linker://toolchain/pgo-profiles/sampling:linker \
-	libsqlite://toolchain/pgo-profiles/sampling:libsqlite \
-	libcrypto://toolchain/pgo-profiles/sampling:libcrypto \
-	server_configurable_flags://toolchain/pgo-profiles/sampling:server_configurable_flags
+	lmkd://toolchain/pgo-profiles/sampling:lmkd \
+	server_configurable_flags://toolchain/pgo-profiles/sampling:server_configurable_flags \
+	surfaceflinger://toolchain/pgo-profiles/sampling:surfaceflinger

sampling/libz_arm64.afdo

diff --git a/sampling/libz_arm64.afdo b/sampling/libz_arm64.afdo
new file mode 100644
index 0000000..d1974f4
--- /dev/null
+++ b/sampling/libz_arm64.afdo
Binary files differ