Swap header/src into the right order

BUILD

@@ -158,7 +158,7 @@ cc_library(
  name = "grpc",
  srcs = [
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -297,7 +297,7 @@ cc_library(
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
@@ -532,7 +532,7 @@ cc_library(
  name = "grpc_unsecure",
  srcs = [
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -657,7 +657,7 @@ cc_library(
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
@@ -1359,7 +1359,7 @@ objc_library(
  name = "grpc_objc",
  srcs = [
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
@@ -1539,7 +1539,7 @@ objc_library(
  "include/grpc/impl/codegen/status.h",
  "include/grpc/status.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",

Makefile

@@ -2435,7 +2435,7 @@ endif
 
 LIBGRPC_SRC = \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \
@@ -2797,7 +2797,7 @@ endif
 
 LIBGRPC_UNSECURE_SRC = \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \

binding.gyp

@@ -559,7 +559,7 @@
  ],
  'sources': [
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
  'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',

build.yaml

@@ -461,10 +461,10 @@ filegroups:
 - name: grpc_lb_policy_grpclb
  headers:
  - src/core/ext/lb_policy/grpclb/load_balancer_api.h
- - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
  src:
  - src/core/ext/lb_policy/grpclb/load_balancer_api.c
- - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h
+ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
  uses:
  - grpc_base
 - name: grpc_lb_policy_pick_first

config.m4

@@ -81,7 +81,7 @@ if test "$PHP_GRPC" != "no"; then
  src/core/lib/support/tmpfile_win32.c \
  src/core/lib/support/wrap_memcpy.c \
  src/core/ext/lb_policy/grpclb/load_balancer_api.c \
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
+ src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/ext/lb_policy/pick_first/pick_first.c \
  src/core/ext/lb_policy/round_robin/round_robin.c \
  src/core/ext/transport/chttp2/client/insecure/channel_create.c \

gRPC.podspec

@@ -162,7 +162,7 @@ Pod::Spec.new do |s|
  'src/core/lib/support/tmpfile_win32.c',
  'src/core/lib/support/wrap_memcpy.c',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
  'src/core/ext/transport/chttp2/transport/alpn.h',
  'src/core/ext/transport/chttp2/transport/bin_encoder.h',
  'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
@@ -314,7 +314,7 @@ Pod::Spec.new do |s|
  'include/grpc/impl/codegen/status.h',
  'include/grpc/status.h',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
  'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
@@ -492,7 +492,7 @@ Pod::Spec.new do |s|
  'src/core/lib/support/time_precise.h',
  'src/core/lib/support/tmpfile.h',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
  'src/core/ext/transport/chttp2/transport/alpn.h',
  'src/core/ext/transport/chttp2/transport/bin_encoder.h',
  'src/core/ext/transport/chttp2/transport/chttp2_transport.h',

grpc.gemspec

@@ -158,7 +158,7 @@ Gem::Specification.new do |s|
  s.files += %w( include/grpc/impl/codegen/status.h )
  s.files += %w( include/grpc/status.h )
  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
- s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c )
+ s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/alpn.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h )
@@ -297,7 +297,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/nanopb/pb_decode.h )
  s.files += %w( third_party/nanopb/pb_encode.h )
  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )
- s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h )
+ s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c )
  s.files += %w( src/core/ext/lb_policy/pick_first/pick_first.c )
  s.files += %w( src/core/ext/lb_policy/round_robin/round_robin.c )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )

package.json

@@ -101,7 +101,7 @@
  "include/grpc/impl/codegen/status.h",
  "include/grpc/status.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -240,7 +240,7 @@
  "third_party/nanopb/pb_decode.h",
  "third_party/nanopb/pb_encode.h",
  "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/ext/lb_policy/pick_first/pick_first.c",
  "src/core/ext/lb_policy/round_robin/round_robin.c",
  "src/core/ext/transport/chttp2/client/insecure/channel_create.c",

package.xml

@@ -162,7 +162,7 @@
  <file baseinstalldir="/" name="include/grpc/impl/codegen/status.h" role="src" />
  <file baseinstalldir="/" name="include/grpc/status.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" />
- <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/alpn.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.h" role="src" />
@@ -301,7 +301,7 @@
  <file baseinstalldir="/" name="third_party/nanopb/pb_decode.h" role="src" />
  <file baseinstalldir="/" name="third_party/nanopb/pb_encode.h" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" />
- <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/pick_first/pick_first.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/lb_policy/round_robin/round_robin.c" role="src" />
  <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" />

src/python/grpcio/grpc_core_dependencies.py

@@ -75,7 +75,7 @@
  'src/core/lib/support/tmpfile_win32.c',
  'src/core/lib/support/wrap_memcpy.c',
  'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
- 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h',
+ 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/ext/lb_policy/pick_first/pick_first.c',
  'src/core/ext/lb_policy/round_robin/round_robin.c',
  'src/core/ext/transport/chttp2/client/insecure/channel_create.c',

tools/doxygen/Doxyfile.core.internal

@@ -774,7 +774,7 @@ include/grpc/impl/codegen/propagation_bits.h \
 include/grpc/impl/codegen/status.h \
 include/grpc/status.h \
 src/core/ext/lb_policy/grpclb/load_balancer_api.h \
-src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
+src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
 src/core/ext/transport/chttp2/transport/alpn.h \
 src/core/ext/transport/chttp2/transport/bin_encoder.h \
 src/core/ext/transport/chttp2/transport/chttp2_transport.h \
@@ -913,7 +913,7 @@ third_party/nanopb/pb_common.h \
 third_party/nanopb/pb_decode.h \
 third_party/nanopb/pb_encode.h \
 src/core/ext/lb_policy/grpclb/load_balancer_api.c \
-src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \
+src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \
 src/core/ext/lb_policy/pick_first/pick_first.c \
 src/core/ext/lb_policy/round_robin/round_robin.c \
 src/core/ext/transport/chttp2/client/insecure/channel_create.c \

tools/run_tests/sources_and_headers.json

@@ -3989,7 +3989,7 @@
  "include/grpc/impl/codegen/status.h", 
  "include/grpc/status.h", 
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", 
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
  "src/core/ext/transport/chttp2/transport/alpn.h", 
  "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 
@@ -4614,7 +4614,7 @@
  "include/grpc/impl/codegen/status.h", 
  "include/grpc/status.h", 
  "src/core/ext/lb_policy/grpclb/load_balancer_api.h", 
- "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c", 
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h", 
  "src/core/ext/transport/chttp2/transport/alpn.h", 
  "src/core/ext/transport/chttp2/transport/bin_encoder.h", 
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h", 

vsprojects/vcxproj/grpc/grpc.vcxproj

@@ -283,7 +283,7 @@
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
- <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c" />
+ <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
@@ -425,7 +425,7 @@
  <ItemGroup>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+ <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
  </ClCompile>

vsprojects/vcxproj/grpc/grpc.vcxproj.filters

@@ -4,7 +4,7 @@
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
  <Filter>src\core\ext\lb_policy\grpclb</Filter>
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+ <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
  <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
@@ -542,7 +542,7 @@
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
  <Filter>src\core\ext\lb_policy\grpclb</Filter>
  </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+ <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
  <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
  </ClInclude>
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h">

vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj

@@ -273,7 +273,7 @@
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h" />
- <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c" />
+ <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\bin_encoder.h" />
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\chttp2_transport.h" />
@@ -401,7 +401,7 @@
  <ItemGroup>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+ <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
  </ClCompile>

vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters

@@ -4,7 +4,7 @@
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.c">
  <Filter>src\core\ext\lb_policy\grpclb</Filter>
  </ClCompile>
- <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
+ <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
  <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
  </ClCompile>
  <ClCompile Include="$(SolutionDir)\..\src\core\ext\lb_policy\pick_first\pick_first.c">
@@ -479,7 +479,7 @@
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\load_balancer_api.h">
  <Filter>src\core\ext\lb_policy\grpclb</Filter>
  </ClInclude>
- <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.c">
+ <ClInclude Include="$(SolutionDir)\..\src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0\load_balancer.pb.h">
  <Filter>src\core\ext\lb_policy\grpclb\proto\grpc\lb\v0</Filter>
  </ClInclude>
  <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\alpn.h">