external: Fix absl export targets

9 files changed, 170 insertions, 10 deletions

diff --git a/etc/import/absl/algorithm/TARGETS.absl b/etc/import/absl/algorithm/TARGETS.absl
index 7114f67a..e4af8e92 100644
--- a/etc/import/absl/algorithm/TARGETS.absl
+++ b/etc/import/absl/algorithm/TARGETS.absl
@@ -5,9 +5,9 @@
   , "hdrs": ["algorithm.h"]
   , "deps": [["absl/base", "config"]]
   }
-, "algorithm_container":
+, "container":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["algorithm_container"]
+  , "name": ["container"]
   , "stage": ["absl", "algorithm"]
   , "hdrs": ["container.h"]
   , "deps":
diff --git a/etc/import/absl/base/TARGETS.absl b/etc/import/absl/base/TARGETS.absl
index 664955e4..a433f688 100644
--- a/etc/import/absl/base/TARGETS.absl
+++ b/etc/import/absl/base/TARGETS.absl
@@ -126,6 +126,26 @@
   , "hdrs": ["config.h", "options.h", "policy_checks.h"]
   }
 , "core_headers":
+  { "type": "export"
+  , "target": "core_headers_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "core_headers_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["core_headers"]
   , "stage": ["absl", "base"]
diff --git a/etc/import/absl/cleanup/TARGETS.absl b/etc/import/absl/cleanup/TARGETS.absl
index 75e5ad21..f6f9b111 100644
--- a/etc/import/absl/cleanup/TARGETS.absl
+++ b/etc/import/absl/cleanup/TARGETS.absl
@@ -1,4 +1,24 @@
 { "cleanup":
+  { "type": "export"
+  , "target": "cleanup_internal_"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "cleanup_internal_":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["cleanup"]
   , "stage": ["absl", "cleanup"]
diff --git a/etc/import/absl/container/TARGETS.absl b/etc/import/absl/container/TARGETS.absl
index 10a0b7b6..ace89f59 100644
--- a/etc/import/absl/container/TARGETS.absl
+++ b/etc/import/absl/container/TARGETS.absl
@@ -122,7 +122,7 @@
     [ "container_memory"
     , "hash_function_defaults"
     , "raw_hash_map"
-    , ["absl/algorithm", "algorithm_container"]
+    , ["absl/algorithm", "container"]
     , ["absl/base", "core_headers"]
     , ["absl/memory", "memory"]
     ]
@@ -256,7 +256,7 @@
     [ "container_memory"
     , "hash_function_defaults"
     , "raw_hash_set"
-    , ["absl/algorithm", "algorithm_container"]
+    , ["absl/algorithm", "container"]
     , ["absl/base", "core_headers"]
     , ["absl/memory", "memory"]
     ]
diff --git a/etc/import/absl/functional/TARGETS.absl b/etc/import/absl/functional/TARGETS.absl
index 3862316b..cbf5adcc 100644
--- a/etc/import/absl/functional/TARGETS.absl
+++ b/etc/import/absl/functional/TARGETS.absl
@@ -1,4 +1,24 @@
 { "function_ref":
+  { "type": "export"
+  , "target": "function_ref_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "function_ref_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["function_ref"]
   , "stage": ["absl", "functional"]
@@ -10,6 +30,26 @@
     ]
   }
 , "any_invocable":
+  { "type": "export"
+  , "target": "any_invocable_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "any_invocable_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["any_invocable"]
   , "stage": ["absl", "functional"]
@@ -23,6 +63,26 @@
     ]
   }
 , "bind_front":
+  { "type": "export"
+  , "target": "bind_front_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "bind_front_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["bind_front"]
   , "stage": ["absl", "functional"]
diff --git a/etc/import/absl/memory/TARGETS.absl b/etc/import/absl/memory/TARGETS.absl
index 2187f004..c8ca115c 100644
--- a/etc/import/absl/memory/TARGETS.absl
+++ b/etc/import/absl/memory/TARGETS.absl
@@ -1,4 +1,24 @@
 { "memory":
+  { "type": "export"
+  , "target": "memory_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "memory_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["memory"]
   , "stage": ["absl", "memory"]
diff --git a/etc/import/absl/meta/TARGETS.absl b/etc/import/absl/meta/TARGETS.absl
index 56ed3601..4ccf97c9 100644
--- a/etc/import/absl/meta/TARGETS.absl
+++ b/etc/import/absl/meta/TARGETS.absl
@@ -1,4 +1,24 @@
 { "type_traits":
+  { "type": "export"
+  , "target": "type_traits_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "type_traits_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["type_traits"]
   , "stage": ["absl", "meta"]
diff --git a/etc/import/absl/strings/TARGETS.absl b/etc/import/absl/strings/TARGETS.absl
index 819914ae..6dfbcb94 100644
--- a/etc/import/absl/strings/TARGETS.absl
+++ b/etc/import/absl/strings/TARGETS.absl
@@ -1,6 +1,6 @@
 { "strings":
   { "type": "export"
-  , "target": "strings_internal_"
+  , "target": "strings_internal"
   , "flexible_config":
     [ "ADD_CFLAGS"
     , "ADD_CXXFLAGS"
@@ -18,7 +18,7 @@
     , "TARGET_ARCH"
     ]
   }
-, "strings_internal_":
+, "strings_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["strings"]
   , "stage": ["absl", "strings"]
@@ -66,7 +66,7 @@
     , "internal/memutil.h"
     ]
   , "deps":
-    [ "strings_internal"
+    [ "internal"
     , ["absl/base", "base"]
     , ["absl/base", "config"]
     , ["absl/base", "core_headers"]
@@ -79,9 +79,9 @@
     , ["absl/numeric", "int128"]
     ]
   }
-, "strings_internal":
+, "internal":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["strings_internal"]
+  , "name": ["internal"]
   , "stage": ["absl", "strings"]
   , "hdrs":
     [ "internal/char_map.h"
@@ -133,7 +133,7 @@
     , "cordz_statistics"
     , "cordz_update_scope"
     , "cordz_update_tracker"
-    , "strings_internal"
+    , "internal"
     , "str_format"
     , "strings"
     , ["absl/base", "base"]
diff --git a/etc/import/absl/utility/TARGETS.absl b/etc/import/absl/utility/TARGETS.absl
index 65c5ac54..91197dcc 100644
--- a/etc/import/absl/utility/TARGETS.absl
+++ b/etc/import/absl/utility/TARGETS.absl
@@ -1,4 +1,24 @@
 { "utility":
+  { "type": "export"
+  , "target": "utility_internal"
+  , "flexible_config":
+    [ "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "AR"
+    , "ARCH"
+    , "CC"
+    , "CFLAGS"
+    , "COMPILER_FAMILY"
+    , "CXX"
+    , "CXXFLAGS"
+    , "DEBUG"
+    , "ENV"
+    , "HOST_ARCH"
+    , "OS"
+    , "TARGET_ARCH"
+    ]
+  }
+, "utility_internal":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["utility"]
   , "stage": ["absl", "utility"]