commit 19aa7836c9fc6868cac7434d13a1b5efc88189ca
author Elliott Hughes <enh@google.com> Thu Sep 04 08:18:04 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 08:18:07 2025 -0700
tree 7eb1658bb3a72dacc66678ff3b32ab8e6e429b20
parent c97cd246cbfd47383c92b45de29b006f8f95890d

Revert^2 "Switch to llvm-libc strtok()/strtok_r()."

c97cd246cbfd47383c92b45de29b006f8f95890d

Change-Id: I435cb207b55c464283462b9703de260abb95c41d

Android.bp

diff --git a/Android.bp b/Android.bp
index 526a408..bf83286 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,8 @@
         "src/string/strrchr.cpp",
         "src/string/strsep.cpp",
         "src/string/strspn.cpp",
+        "src/string/strtok.cpp",
+        "src/string/strtok_r.cpp",
         "src/wchar/wcpcpy.cpp",
         "src/wchar/wcpncpy.cpp",
         "src/wchar/wcscat.cpp",
@@ -191,6 +193,8 @@
         "test/src/string/strrchr_test.cpp",
         "test/src/string/strsep_test.cpp",
         "test/src/string/strspn_test.cpp",
+        "test/src/string/strtok_test.cpp",
+        "test/src/string/strtok_r_test.cpp",
         "test/src/wchar/wcpcpy_test.cpp",
         "test/src/wchar/wcpncpy_test.cpp",
         "test/src/wchar/wcscat_test.cpp",