[libc] Complete soft migration of files to /strings

This removes the exec script and old location targets for files that
were moved to /strings.

This is blocked on the merging of llvm/llvm-project#119623
into Fuchsia.

Fixed: 383347626
Change-Id: Ia8de544a2695125f888544071b08f37906fe381d
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1172249
Reviewed-by: David Fang <[email protected]>
Fuchsia-Auto-Submit: Caslyn Tonelli <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>
Reviewed-by: Roland McGrath <[email protected]>

Author: Caslyn

.gn

@@ -47,9 +47,6 @@ exec_script_whitelist = [
   "//build/toolchain/default_concurrent_jobs.gni",
   "//build/toolchain/zircon/zircon_toolchain.gni",
   "//zircon/kernel/arch/x86/phys/BUILD.gn",
-
-  # TODO(https://fxbug.dev/383347626): This is temporary to perform soft-migration.
-  "//zircon/system/ulib/c/string/file_exists_check.gni",
 ]
 
 check_system_includes = true

sdk/lib/ld/BUILD.gn

@@ -324,6 +324,7 @@ static_library("standalone") {
     "//zircon/system/public",
     "//zircon/system/ulib/c/stdlib:hermetic",
     "//zircon/system/ulib/c/string:hermetic",
+    "//zircon/system/ulib/c/strings:hermetic",
   ]
 
   if (is_linux) {

zircon/system/ulib/c/BUILD.gn

@@ -11,7 +11,6 @@ import("//build/toolchain/ifs_shared_library.gni")
 import("//build/zircon/migrated_targets.gni")
 import("libc.gni")
 import("libc_toolchain.gni")
-import("string/file_exists_check.gni")
 
 assert(libc == get_path_info(get_path_info(".", "abspath"), "dir"),
        get_path_info(get_path_info(".", "abspath"), "dir"))
@@ -34,15 +33,15 @@ libc_components = [
 libc_testonly_components = []
 
 if (use_llvm_libc_string_functions) {
-  libc_components += [ "string" ]
-  if (!file_exists_in_string) {
-    libc_components += [ "strings" ]
-  }
+  libc_components += [
+    "string",
+    "strings",
+  ]
 } else {
-  libc_testonly_components += [ "string" ]
-  if (!file_exists_in_string) {
-    libc_testonly_components += [ "strings" ]
-  }
+  libc_testonly_components += [
+    "string",
+    "strings",
+  ]
 }
 
 group("components") {

zircon/system/ulib/c/string/BUILD.gn

@@ -3,20 +3,13 @@
 # found in the LICENSE file.
 
 import("../libc.gni")
-import("file_exists_check.gni")
 
 llvm_libc_group("string") {
   deps = [
     ":mem",
     ":str",
   ]
 
-  # TODO(https://fxbug.dev/383347626): these files are moved from string/ to
-  # strings/ after llvm rev 431ea2d076f8a5ca35b2c293dd5d62f5ce083f45
-  if (file_exists_in_string) {
-    deps += [ ":compat" ]
-  }
-
   # TODO(https://fxbug.dev/42053650): not yet using the llvm-libc versions of these
   non_test_deps = [
     "//zircon/third_party/ulib/musl/src/string:strerror_r",
@@ -197,15 +190,6 @@ llvm_libc_source_set("str") {
   ]
 
   deps = [ ":minimal-str" ]
-
-  # TODO(https://fxbug.dev/383347626): these files are moved from string/ to
-  # strings/ after llvm rev 431ea2d076f8a5ca35b2c293dd5d62f5ce083f45
-  if (file_exists_in_string) {
-    functions += [
-      "strncasecmp",
-      "strcasecmp",
-    ]
-  }
 }
 
 llvm_libc_source_set("strsignalerror") {
@@ -252,36 +236,10 @@ llvm_libc_source_set("StringUtil") {
   ]
 }
 
-if (file_exists_in_string) {
-  llvm_libc_source_set("compat") {
-    functions = [
-      "bcmp",
-      "bcopy",
-      "bzero",
-      "index",
-      "rindex",
-    ]
-
-    deps = [ ":swab" ]
-  }
-
-  # This lives in libc/src/unistd upstream because it's declared in <unistd.h>
-  # but it's really a compat string function, so we include it here instead.
-  llvm_libc_source_set("swab") {
-    dir = "unistd"
-    functions = [ "swab" ]
-  }
-}
-
 # This provides an archive library of the universally safe string functions.
 # When built outside the "user.libc" environment, these always define only
 # hidden-visibility symbols and should be safe in any build environment.
 static_library("hermetic") {
   complete_static_lib = true
   deps = [ ":minimal-str" ]
-  if (file_exists_in_string) {
-    deps += [ ":compat" ]
-  } else {
-    deps += [ "//zircon/system/ulib/c/strings:compat" ]
-  }
 }

zircon/system/ulib/c/string/file_exists.sh

@@ -3,39 +3,39 @@
 # found in the LICENSE file.
 
 import("../libc.gni")
-import("../string/file_exists_check.gni")
 
-if (!file_exists_in_string) {
-  llvm_libc_group("strings") {
-    deps = [
-      ":compat",
-      ":str",
-    ]
-  }
+llvm_libc_source_set("strings") {
+  functions = [
+    "strcasecmp",
+    "strncasecmp",
+  ]
 
-  llvm_libc_source_set("str") {
-    functions = [
-      "strcasecmp",
-      "strncasecmp",
-    ]
-  }
+  deps = [ ":compat" ]
+}
+
+llvm_libc_source_set("compat") {
+  functions = [
+    "bcmp",
+    "bcopy",
+    "bzero",
+    "index",
+    "rindex",
+  ]
 
-  llvm_libc_source_set("compat") {
-    functions = [
-      "bcmp",
-      "bcopy",
-      "bzero",
-      "index",
-      "rindex",
-    ]
+  deps = [ ":swab" ]
+}
 
-    deps = [ ":swab" ]
-  }
+# This lives in libc/src/unistd upstream because it's declared in <unistd.h>
+# but it's really a compat string function, so we include it here instead.
+llvm_libc_source_set("swab") {
+  dir = "unistd"
+  functions = [ "swab" ]
+}
 
-  # This lives in libc/src/unistd upstream because it's declared in <unistd.h>
-  # but it's really a compat string function, so we include it here instead.
-  llvm_libc_source_set("swab") {
-    dir = "unistd"
-    functions = [ "swab" ]
-  }
+# This provides an archive library of the universally safe string functions.
+# When built outside the "user.libc" environment, these always define only
+# hidden-visibility symbols and should be safe in any build environment.
+static_library("hermetic") {
+  complete_static_lib = true
+  deps = [ ":compat" ]
 }