From 9551b04602985795ef7667a3f6238e989bdba765 Mon Sep 17 00:00:00 2001
From: Michael Hoisie <hoisie@google.com>
Date: Sat, 29 Apr 2023 10:02:32 -0700
Subject: [PATCH] Add support for SQLite 'regexp' methods

Enable several ICU extensions that were previously
disabled. This CL just imports the changes from
https://android-review.googlesource.com/c/platform/external/sqlite/+/2572310.

Updates #8163

PiperOrigin-RevId: 528151614
---
 .../java/android/database/SQLiteDatabaseTest.java  | 14 ++++++++++++++
 nativeruntime/build.gradle                         |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/integration_tests/ctesque/src/sharedTest/java/android/database/SQLiteDatabaseTest.java b/integration_tests/ctesque/src/sharedTest/java/android/database/SQLiteDatabaseTest.java
index fa11ce7e237..90bf5bedf5f 100644
--- a/integration_tests/ctesque/src/sharedTest/java/android/database/SQLiteDatabaseTest.java
+++ b/integration_tests/ctesque/src/sharedTest/java/android/database/SQLiteDatabaseTest.java
@@ -223,4 +223,18 @@ public void collate_unicode() {
     c.close();
     assertThat(sorted).containsExactly("aaa", "abc", "ABC", "bbb").inOrder();
   }
+
+  @Test
+  @Config(minSdk = LOLLIPOP)
+  @SdkSuppress(minSdkVersion = LOLLIPOP)
+  public void regex_selection() {
+    ContentValues values = new ContentValues();
+    values.put("first_column", "test");
+    database.insert("table_name", null, values);
+    String select = "first_column regexp ?";
+    String[] selectArgs = {
+      "test",
+    };
+    assertThat(database.delete("table_name", select, selectArgs)).isEqualTo(1);
+  }
 }
diff --git a/nativeruntime/build.gradle b/nativeruntime/build.gradle
index 1ef93175aaa..f8d496d5b3a 100644
--- a/nativeruntime/build.gradle
+++ b/nativeruntime/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   api project(":utils:reflector")
   api "com.google.guava:guava:$guavaJREVersion"
 
-  implementation "org.robolectric:nativeruntime-dist-compat:1.0.0"
+  implementation "org.robolectric:nativeruntime-dist-compat:1.0.1"
 
   annotationProcessor "com.google.auto.service:auto-service:$autoServiceVersion"
   compileOnly "com.google.auto.service:auto-service-annotations:$autoServiceVersion"