Standardize on grpc/support/port_platform.h usage in src/core/... (#27568)

3 years ago · 79097afb56
parent b50b59c582
commit 79097afb56
79 changed files with 89 additions and 85 deletions
--- a/1
+++ b/1
@ -803,6 +803,7 @@ grpc_cc_library(
    language = "c++",
    public_hdrs = [
        "include/grpc/impl/codegen/port_platform.h",
+        "include/grpc/support/port_platform.h",
    ],
 )

--- a/src/core/ext/filters/client_channel/http_connect_handshaker.h
+++ b/src/core/ext/filters/client_channel/http_connect_handshaker.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/config/core_configuration.h"

--- a/src/core/ext/transport/binder/client/channel_create.cc
+++ b/src/core/ext/transport/binder/client/channel_create.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/client/channel_create.h"

--- a/src/core/ext/transport/binder/client/channel_create.h
+++ b/src/core/ext/transport/binder/client/channel_create.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #ifdef GPR_ANDROID

--- a/src/core/ext/transport/binder/client/channel_create_impl.cc
+++ b/src/core/ext/transport/binder/client/channel_create_impl.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/client/channel_create_impl.h"

--- a/src/core/ext/transport/binder/client/channel_create_impl.h
+++ b/src/core/ext/transport/binder/client/channel_create_impl.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/lib/channel/channel_args.h"
--- a/src/core/ext/transport/binder/client/jni_utils.cc
+++ b/src/core/ext/transport/binder/client/jni_utils.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/client/jni_utils.h"

--- a/src/core/ext/transport/binder/client/jni_utils.h
+++ b/src/core/ext/transport/binder/client/jni_utils.h
@ -17,7 +17,7 @@

 #if defined(ANDROID) || defined(__ANDROID__)

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <jni.h>

--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ b/src/core/ext/transport/binder/server/binder_server.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/server/binder_server.h"

--- a/src/core/ext/transport/binder/server/binder_server.h
+++ b/src/core/ext/transport/binder/server/binder_server.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <string>

--- a/src/core/ext/transport/binder/server/binder_server_credentials.cc
+++ b/src/core/ext/transport/binder/server/binder_server_credentials.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <grpcpp/security/server_credentials.h>

--- a/src/core/ext/transport/binder/server/binder_server_credentials.h
+++ b/src/core/ext/transport/binder/server/binder_server_credentials.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_CREDENTIALS_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_CREDENTIALS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <grpcpp/security/server_credentials.h>

--- a/src/core/ext/transport/binder/transport/binder_stream.h
+++ b/src/core/ext/transport/binder/transport/binder_stream.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/transport/binder_transport.h"

--- a/src/core/ext/transport/binder/transport/binder_transport.h
+++ b/src/core/ext/transport/binder/transport/binder_transport.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <memory>
 #include <string>
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <functional>
 #include <string>
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"

--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <functional>
 #include <map>
--- a/src/core/ext/transport/binder/wire_format/binder.h
+++ b/src/core/ext/transport/binder/wire_format/binder.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <cstdint>
 #include <functional>
--- a/src/core/ext/transport/binder/wire_format/binder_android.cc
+++ b/src/core/ext/transport/binder/wire_format/binder_android.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #ifdef GPR_SUPPORT_BINDER_TRANSPORT

--- a/src/core/ext/transport/binder/wire_format/binder_android.h
+++ b/src/core/ext/transport/binder/wire_format/binder_android.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_ANDROID_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_ANDROID_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #ifdef GPR_SUPPORT_BINDER_TRANSPORT

--- a/src/core/ext/transport/binder/wire_format/binder_constants.cc
+++ b/src/core/ext/transport/binder/wire_format/binder_constants.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/wire_format/binder_constants.h"

--- a/src/core/ext/transport/binder/wire_format/binder_constants.h
+++ b/src/core/ext/transport/binder/wire_format/binder_constants.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/base/attributes.h"

--- a/src/core/ext/transport/binder/wire_format/transaction.cc
+++ b/src/core/ext/transport/binder/wire_format/transaction.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/wire_format/transaction.h"

--- a/src/core/ext/transport/binder/wire_format/transaction.h
+++ b/src/core/ext/transport/binder/wire_format/transaction.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <string>
 #include <vector>
--- a/src/core/ext/transport/binder/wire_format/wire_reader.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <memory>
 #include <utility>
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"

--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <memory>
 #include <utility>
--- a/src/core/ext/transport/binder/wire_format/wire_writer.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"

--- a/src/core/ext/transport/binder/wire_format/wire_writer.h
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
 #define GRPC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <string>
 #include <vector>
--- a/src/core/ext/transport/chttp2/transport/hpack_constants.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_constants.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <stdint.h>

--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_index.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_index.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_INDEX_H
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_INDEX_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/types/optional.h"

--- a/src/core/ext/transport/chttp2/transport/popularity_count.h
+++ b/src/core/ext/transport/chttp2/transport/popularity_count.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_POPULARITY_COUNT_H
 #define GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_POPULARITY_COUNT_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 namespace grpc_core {

--- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
+++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
@ -16,7 +16,7 @@
 *
 */

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h"

--- a/src/core/ext/transport/cronet/transport/cronet_status.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_status.cc
@ -16,7 +16,7 @@
 *
 */

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/ext/transport/cronet/transport/cronet_status.h"

--- a/src/core/ext/transport/cronet/transport/cronet_status.h
+++ b/src/core/ext/transport/cronet/transport/cronet_status.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H
 #define GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <grpc/status.h>

--- a/src/core/lib/channel/channel_trace.cc
+++ b/src/core/lib/channel/channel_trace.cc
@ -16,7 +16,7 @@
 *
 */

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/channel/channel_trace.h"

--- a/src/core/lib/channel/channel_trace.h
+++ b/src/core/lib/channel/channel_trace.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
 #define GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <grpc/grpc.h>

--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@ -16,7 +16,7 @@
 *
 */

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/channel/channelz.h"

--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_LIB_CHANNEL_CHANNELZ_H
 #define GRPC_CORE_LIB_CHANNEL_CHANNELZ_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <atomic>
 #include <set>
--- a/src/core/lib/channel/channelz_registry.cc
+++ b/src/core/lib/channel/channelz_registry.cc
@ -16,7 +16,7 @@
 *
 */

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/channel/channelz_registry.h"

--- a/src/core/lib/channel/channelz_registry.h
+++ b/src/core/lib/channel/channelz_registry.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
 #define GRPC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <stdint.h>

--- a/src/core/lib/config/core_configuration.h
+++ b/src/core/lib/config/core_configuration.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
 #define GRPC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <atomic>

--- a/src/core/lib/gpr/tls.h
+++ b/src/core/lib/gpr/tls.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_LIB_GPR_TLS_H
 #define GRPC_CORE_LIB_GPR_TLS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <type_traits>

--- a/src/core/lib/gpr/useful.h
+++ b/src/core/lib/gpr/useful.h
@ -19,7 +19,7 @@
 #ifndef GRPC_CORE_LIB_GPR_USEFUL_H
 #define GRPC_CORE_LIB_GPR_USEFUL_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <cstddef>

--- a/src/core/lib/gprpp/bitset.h
+++ b/src/core/lib/gprpp/bitset.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_BITSET_H
 #define GRPC_CORE_LIB_GPRPP_BITSET_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/gprpp/capture.h
+++ b/src/core/lib/gprpp/capture.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_CAPTURE_H
 #define GRPC_CORE_LIB_GPRPP_CAPTURE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <tuple>
 #include <utility>
--- a/src/core/lib/gprpp/construct_destruct.h
+++ b/src/core/lib/gprpp/construct_destruct.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H
 #define GRPC_CORE_LIB_GPRPP_CONSTRUCT_DESTRUCT_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/gprpp/match.h
+++ b/src/core/lib/gprpp/match.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_MATCH_H
 #define GRPC_CORE_LIB_GPRPP_MATCH_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/types/variant.h"

--- a/src/core/lib/gprpp/overload.h
+++ b/src/core/lib/gprpp/overload.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_OVERLOAD_H
 #define GRPC_CORE_LIB_GPRPP_OVERLOAD_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/gprpp/table.h
+++ b/src/core/lib/gprpp/table.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_GPRPP_TABLE_H
 #define GRPC_CORE_LIB_GPRPP_TABLE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/promise/activity.cc
+++ b/src/core/lib/promise/activity.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/promise/activity.h"

--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_ACTIVITY_H
 #define GRPC_CORE_LIB_PROMISE_ACTIVITY_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <functional>

--- a/src/core/lib/promise/context.h
+++ b/src/core/lib/promise/context.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_CONTEXT_H
 #define GRPC_CORE_LIB_PROMISE_CONTEXT_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/promise/detail/basic_join.h
+++ b/src/core/lib/promise/detail/basic_join.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_BASIC_JOIN_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_BASIC_JOIN_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <tuple>
 #include <utility>
--- a/src/core/lib/promise/detail/basic_seq.h
+++ b/src/core/lib/promise/detail/basic_seq.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_BASIC_SEQ_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_BASIC_SEQ_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <cassert>

--- a/src/core/lib/promise/detail/promise_factory.h
+++ b/src/core/lib/promise/detail/promise_factory.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/meta/type_traits.h"

--- a/src/core/lib/promise/detail/promise_like.h
+++ b/src/core/lib/promise/detail/promise_like.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <utility>

--- a/src/core/lib/promise/detail/status.h
+++ b/src/core/lib/promise/detail/status.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_STATUS_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_STATUS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
--- a/src/core/lib/promise/detail/switch.h
+++ b/src/core/lib/promise/detail/switch.h
@ -21,7 +21,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_DETAIL_SWITCH_H
 #define GRPC_CORE_LIB_PROMISE_DETAIL_SWITCH_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <stdlib.h>

--- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
+++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H
 #define GRPC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/iomgr/exec_ctx.h"

--- a/src/core/lib/promise/for_each.h
+++ b/src/core/lib/promise/for_each.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_FOR_EACH_H
 #define GRPC_CORE_LIB_PROMISE_FOR_EACH_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/status/status.h"
 #include "absl/types/variant.h"
--- a/src/core/lib/promise/if.h
+++ b/src/core/lib/promise/if.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_IF_H
 #define GRPC_CORE_LIB_PROMISE_IF_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
--- a/src/core/lib/promise/intra_activity_waiter.h
+++ b/src/core/lib/promise/intra_activity_waiter.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_INTRA_ACTIVITY_WAITER_H
 #define GRPC_CORE_LIB_PROMISE_INTRA_ACTIVITY_WAITER_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/promise/activity.h"

--- a/src/core/lib/promise/join.h
+++ b/src/core/lib/promise/join.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_JOIN_H
 #define GRPC_CORE_LIB_PROMISE_JOIN_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/promise/detail/basic_join.h"

--- a/src/core/lib/promise/latch.h
+++ b/src/core/lib/promise/latch.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_LATCH_H
 #define GRPC_CORE_LIB_PROMISE_LATCH_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <grpc/support/log.h>

--- a/src/core/lib/promise/loop.h
+++ b/src/core/lib/promise/loop.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_LOOP_H
 #define GRPC_CORE_LIB_PROMISE_LOOP_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/types/variant.h"

--- a/src/core/lib/promise/map.h
+++ b/src/core/lib/promise/map.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_MAP_H
 #define GRPC_CORE_LIB_PROMISE_MAP_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <tuple>

--- a/src/core/lib/promise/observable.h
+++ b/src/core/lib/promise/observable.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_OBSERVABLE_H
 #define GRPC_CORE_LIB_PROMISE_OBSERVABLE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <limits>

--- a/src/core/lib/promise/pipe.h
+++ b/src/core/lib/promise/pipe.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_PIPE_H
 #define GRPC_CORE_LIB_PROMISE_PIPE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
--- a/src/core/lib/promise/poll.h
+++ b/src/core/lib/promise/poll.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_POLL_H
 #define GRPC_CORE_LIB_PROMISE_POLL_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/types/variant.h"

--- a/src/core/lib/promise/promise.h
+++ b/src/core/lib/promise/promise.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_PROMISE_H
 #define GRPC_CORE_LIB_PROMISE_PROMISE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <functional>

--- a/src/core/lib/promise/race.h
+++ b/src/core/lib/promise/race.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_RACE_H
 #define GRPC_CORE_LIB_PROMISE_RACE_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <tuple>

--- a/src/core/lib/promise/seq.h
+++ b/src/core/lib/promise/seq.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_SEQ_H
 #define GRPC_CORE_LIB_PROMISE_SEQ_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/types/variant.h"

--- a/src/core/lib/promise/try_join.h
+++ b/src/core/lib/promise/try_join.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_TRY_JOIN_H
 #define GRPC_CORE_LIB_PROMISE_TRY_JOIN_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/promise/detail/basic_join.h"
 #include "src/core/lib/promise/detail/status.h"
--- a/src/core/lib/promise/try_seq.h
+++ b/src/core/lib/promise/try_seq.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_TRY_SEQ_H
 #define GRPC_CORE_LIB_PROMISE_TRY_SEQ_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include <tuple>

--- a/src/core/lib/promise/wait_set.h
+++ b/src/core/lib/promise/wait_set.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_PROMISE_WAIT_SET_H
 #define GRPC_CORE_LIB_PROMISE_WAIT_SET_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "absl/container/flat_hash_set.h"

--- a/src/core/lib/surface/builtins.cc
+++ b/src/core/lib/surface/builtins.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/surface/builtins.h"

--- a/src/core/lib/surface/builtins.h
+++ b/src/core/lib/surface/builtins.h
@ -15,7 +15,7 @@
 #ifndef GRPC_CORE_LIB_SURFACE_BUILTINS_H
 #define GRPC_CORE_LIB_SURFACE_BUILTINS_H

-#include <grpc/impl/codegen/port_platform.h>
+#include <grpc/support/port_platform.h>

 #include "src/core/lib/config/core_configuration.h"

--- a/tools/run_tests/sanity/check_port_platform.py
+++ b/tools/run_tests/sanity/check_port_platform.py
@ -20,7 +20,7 @@ import sys
 os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../..'))


-def check_port_platform_inclusion(directory_root):
+def check_port_platform_inclusion(directory_root, legal_list):
    bad_files = []
    for root, dirs, files in os.walk(directory_root):
        for filename in files:
@ -45,10 +45,7 @@ def check_port_platform_inclusion(directory_root):
                all_lines_in_file = f.readlines()
                for index, l in enumerate(all_lines_in_file):
                    if '#include' in l:
-                        if l not in [
-                                '#include <grpc/support/port_platform.h>\n',
-                                '#include <grpc/impl/codegen/port_platform.h>\n'
-                        ]:
+                        if l not in legal_list:
                            bad_files.append(path)
                        elif all_lines_in_file[index + 1] != '\n':
                            # Require a blank line after including port_platform.h in
@ -60,8 +57,14 @@ def check_port_platform_inclusion(directory_root):


 all_bad_files = []
-all_bad_files += check_port_platform_inclusion(os.path.join('src', 'core'))
-all_bad_files += check_port_platform_inclusion(os.path.join('include', 'grpc'))
+all_bad_files += check_port_platform_inclusion(os.path.join('src', 'core'), [
+    '#include <grpc/support/port_platform.h>\n',
+])
+all_bad_files += check_port_platform_inclusion(os.path.join(
+    'include', 'grpc'), [
+        '#include <grpc/support/port_platform.h>\n',
+        '#include <grpc/impl/codegen/port_platform.h>\n',
+    ])

 if sys.argv[1:] == ['--fix']:
    for path in all_bad_files:
@ -70,7 +73,7 @@ if sys.argv[1:] == ['--fix']:
        with open(path) as f:
            for l in f.readlines():
                if not found and '#include' in l:
-                    text += '#include <grpc/impl/codegen/port_platform.h>\n\n'
+                    text += '#include <grpc/support/port_platform.h>\n\n'
                    found = True
                text += l
        with open(path, 'w') as f: