commit 544f960d992a7bce814f5423ccc5f4f80c183410
author Victor Chang <vichang@google.com> Wed Feb 09 10:01:15 2022 +0000
committer Victor Chang <vichang@google.com> Wed Feb 09 14:56:21 2022 +0000
tree b7fcc36aebdcccf6884937d1d03773ef0a07fa36
parent 3a2eab0bbe6176255b70f524dacb5061c2dfff4a

Update native bridge stub to add ucol_clone

The ucol_clone API was introduced to libicui18n
in https://r.android.com/1967404
and thus the native bridge needs to be updated.

Bug: 210982984
Test: m droid
Merged-In: I412c9929b7a9e54ccf83ea50eb37adf07a3dc5b5
Change-Id: I412c9929b7a9e54ccf83ea50eb37adf07a3dc5b5
(cherry picked from commit 9dcde504176b24179a60ae7f6662c64afe3336b2)

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);