commit 4b7f0feceef36203320a58be5e455eee67ce18ec
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 13 09:55:56 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 13 09:55:56 2022 +0000
tree 1045596b4c0a7165c9cea083124f1d20d8c2a2f2
parent ae874e840d6e35db78b9a22489de3cf4e6517551
parent 8b0aef1eabe94d5b9c6f122867c5259dd0ad52c9

Snap for 8293597 from 8b0aef1eabe94d5b9c6f122867c5259dd0ad52c9 to t-keystone-qcom-release

Change-Id: I5ee50610ab62d2e78aabb3493994ec0a9e29387c

libicui18n/stubs_arm.cc

diff --git a/libicui18n/stubs_arm.cc b/libicui18n/stubs_arm.cc
index 7dcb460..1099765 100644
--- a/libicui18n/stubs_arm.cc
+++ b/libicui18n/stubs_arm.cc
@@ -4109,6 +4109,7 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucfpos_setInt64IterationContext_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucfpos_setState_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_cloneBinary_70);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_clone_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_closeElements_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_close_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_countAvailable_70);
@@ -8776,6 +8777,7 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucfpos_setInt64IterationContext_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucfpos_setState_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_cloneBinary_70);
+  INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_clone_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_closeElements_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_close_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_countAvailable_70);

libicui18n/stubs_arm64.cc

diff --git a/libicui18n/stubs_arm64.cc b/libicui18n/stubs_arm64.cc
index c942fe4..c00c03d 100644
--- a/libicui18n/stubs_arm64.cc
+++ b/libicui18n/stubs_arm64.cc
@@ -4109,6 +4109,7 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucfpos_setInt64IterationContext_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucfpos_setState_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_cloneBinary_70);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_clone_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_closeElements_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_close_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucol_countAvailable_70);
@@ -8776,6 +8777,7 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucfpos_setInt64IterationContext_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucfpos_setState_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_cloneBinary_70);
+  INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_clone_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_closeElements_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_close_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicui18n.so", ucol_countAvailable_70);

libicuuc/stubs_arm.cc

diff --git a/libicuuc/stubs_arm.cc b/libicuuc/stubs_arm.cc
index 51b8864..8bb5435 100644
--- a/libicuuc/stubs_arm.cc
+++ b/libicuuc/stubs_arm.cc
@@ -1752,6 +1752,7 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbFromUWriteUChars_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbToUWriteSub_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbToUWriteUChars_70);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_clone_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_close_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_compareNames_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_convertEx_70);
@@ -4129,6 +4130,7 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbFromUWriteUChars_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbToUWriteSub_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbToUWriteUChars_70);
+  INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_clone_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_close_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_compareNames_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_convertEx_70);

libicuuc/stubs_arm64.cc

diff --git a/libicuuc/stubs_arm64.cc b/libicuuc/stubs_arm64.cc
index 71a1a92..9c59da2 100644
--- a/libicuuc/stubs_arm64.cc
+++ b/libicuuc/stubs_arm64.cc
@@ -1752,6 +1752,7 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbFromUWriteUChars_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbToUWriteSub_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_cbToUWriteUChars_70);
+DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_clone_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_close_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_compareNames_70);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(ucnv_convertEx_70);
@@ -4129,6 +4130,7 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbFromUWriteUChars_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbToUWriteSub_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_cbToUWriteUChars_70);
+  INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_clone_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_close_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_compareNames_70);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libicuuc.so", ucnv_convertEx_70);