2 files changed, 20 insertions, 11 deletions
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index 990a372c..64fe35a2 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -1502,8 +1502,8 @@
   , "hdrs":
     [ ["./", "include/grpc++", "grpc++_config_proto_headers"]
     , ["./", "include/grpcpp", "grpcpp_config_proto_headers"]
+    , ["@", "protobuf", ".", "protobuf_headers"]
     ]
-  , "deps": [["@", "protobuf", ".", "protobuf_headers"]]
   }
 , "grpc++_codegen_proto":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/etc/import/third_party/TARGETS.grpc b/etc/import/third_party/TARGETS.grpc
index 5ebf1703..47026121 100644
--- a/etc/import/third_party/TARGETS.grpc
+++ b/etc/import/third_party/TARGETS.grpc
@@ -95,17 +95,10 @@
       }
     }
   }
-, "address_sorting":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["address_sorting"]
+, "address_sorting_headers":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs": ["address_sorting/address_sorting_internal.h"]
   , "stage": ["third_party", "address_sorting"]
-  , "pure C": ["YES"]
-  , "srcs":
-    [ "address_sorting/address_sorting.c"
-    , "address_sorting/address_sorting_posix.c"
-    , "address_sorting/address_sorting_windows.c"
-    ]
-  , "hdrs": ["address_sorting/address_sorting_internal.h"]
   , "deps":
     [ [ "./"
       , "address_sorting/include/address_sorting"
@@ -113,4 +106,20 @@
       ]
     ]
   }
+, "address_sorting_srcs":
+  { "type": ["@", "rules", "data", "staged"]
+  , "stage": ["third_party", "address_sorting"]
+  , "srcs":
+    [ "address_sorting/address_sorting.c"
+    , "address_sorting/address_sorting_posix.c"
+    , "address_sorting/address_sorting_windows.c"
+    ]
+  }
+, "address_sorting":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["address_sorting"]
+  , "pure C": ["YES"]
+  , "srcs": ["address_sorting_srcs"]
+  , "hdrs": ["address_sorting_headers"]
+  }
 }