Merge pull request #12888 from muxi/port-12881-12883

Port #12881 (Make platform-specific headers textual) and #12883 (Fix GID podspec issue)

7 files changed, 79 insertions, 30 deletions

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 08ef738732..f19b672f5a 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -106,6 +106,8 @@ Pod::Spec.new do |s|
     ss.source_files = 'include/grpc/support/alloc.h',
                       'include/grpc/support/atm.h',
                       'include/grpc/support/atm_gcc_atomic.h',
+                      'include/grpc/support/atm_gcc_sync.h',
+                      'include/grpc/support/atm_windows.h',
                       'include/grpc/support/avl.h',
                       'include/grpc/support/cmdline.h',
                       'include/grpc/support/cpu.h',
@@ -120,13 +122,18 @@ Pod::Spec.new do |s|
                       'include/grpc/support/sync_custom.h',
                       'include/grpc/support/sync_generic.h',
                       'include/grpc/support/sync_posix.h',
+                      'include/grpc/support/sync_windows.h',
                       'include/grpc/support/thd.h',
                       'include/grpc/support/time.h',
                       'include/grpc/support/tls.h',
+                      'include/grpc/support/tls_gcc.h',
+                      'include/grpc/support/tls_msvc.h',
                       'include/grpc/support/tls_pthread.h',
                       'include/grpc/support/useful.h',
                       'include/grpc/impl/codegen/atm.h',
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
+                      'include/grpc/impl/codegen/atm_gcc_sync.h',
+                      'include/grpc/impl/codegen/atm_windows.h',
                       'include/grpc/impl/codegen/gpr_slice.h',
                       'include/grpc/impl/codegen/gpr_types.h',
                       'include/grpc/impl/codegen/port_platform.h',
@@ -134,6 +141,7 @@ Pod::Spec.new do |s|
                       'include/grpc/impl/codegen/sync_custom.h',
                       'include/grpc/impl/codegen/sync_generic.h',
                       'include/grpc/impl/codegen/sync_posix.h',
+                      'include/grpc/impl/codegen/sync_windows.h',
                       'include/grpc/impl/codegen/byte_buffer.h',
                       'include/grpc/impl/codegen/byte_buffer_reader.h',
                       'include/grpc/impl/codegen/compression_types.h',
@@ -145,6 +153,8 @@ Pod::Spec.new do |s|
                       'include/grpc/impl/codegen/status.h',
                       'include/grpc/impl/codegen/atm.h',
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
+                      'include/grpc/impl/codegen/atm_gcc_sync.h',
+                      'include/grpc/impl/codegen/atm_windows.h',
                       'include/grpc/impl/codegen/gpr_slice.h',
                       'include/grpc/impl/codegen/gpr_types.h',
                       'include/grpc/impl/codegen/port_platform.h',
@@ -152,6 +162,7 @@ Pod::Spec.new do |s|
                       'include/grpc/impl/codegen/sync_custom.h',
                       'include/grpc/impl/codegen/sync_generic.h',
                       'include/grpc/impl/codegen/sync_posix.h',
+                      'include/grpc/impl/codegen/sync_windows.h',
                       'include/grpc/grpc_security.h',
                       'include/grpc/byte_buffer.h',
                       'include/grpc/byte_buffer_reader.h',
diff --git a/gRPC.podspec b/gRPC.podspec
index 6bec50f0de..4c6cd3535f 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -63,10 +63,13 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'GID' do |ss|
+    ss.ios.deployment_target = '7.0'
+
     ss.header_mappings_dir = "#{src_dir}"
 
     ss.source_files = "#{src_dir}/GRPCCall+GID.{h,m}"
 
+    ss.dependency "#{s.name}/Main", version
     ss.dependency 'Google/SignIn'
   end
 end
diff --git a/include/grpc/module.modulemap b/include/grpc/module.modulemap
index 226cc6cf87..342adc0dc9 100644
--- a/include/grpc/module.modulemap
+++ b/include/grpc/module.modulemap
@@ -4,7 +4,6 @@ framework module grpc {
 
   header "support/alloc.h"
   header "support/atm.h"
-  header "support/atm_gcc_atomic.h"
   header "support/avl.h"
   header "support/cmdline.h"
   header "support/cpu.h"
@@ -16,23 +15,17 @@ framework module grpc {
   header "support/string_util.h"
   header "support/subprocess.h"
   header "support/sync.h"
-  header "support/sync_custom.h"
   header "support/sync_generic.h"
-  header "support/sync_posix.h"
   header "support/thd.h"
   header "support/time.h"
   header "support/tls.h"
-  header "support/tls_pthread.h"
   header "support/useful.h"
   header "impl/codegen/atm.h"
-  header "impl/codegen/atm_gcc_atomic.h"
   header "impl/codegen/gpr_slice.h"
   header "impl/codegen/gpr_types.h"
   header "impl/codegen/port_platform.h"
   header "impl/codegen/sync.h"
-  header "impl/codegen/sync_custom.h"
   header "impl/codegen/sync_generic.h"
-  header "impl/codegen/sync_posix.h"
   header "impl/codegen/byte_buffer.h"
   header "impl/codegen/byte_buffer_reader.h"
   header "impl/codegen/compression_types.h"
@@ -43,14 +36,11 @@ framework module grpc {
   header "impl/codegen/slice.h"
   header "impl/codegen/status.h"
   header "impl/codegen/atm.h"
-  header "impl/codegen/atm_gcc_atomic.h"
   header "impl/codegen/gpr_slice.h"
   header "impl/codegen/gpr_types.h"
   header "impl/codegen/port_platform.h"
   header "impl/codegen/sync.h"
-  header "impl/codegen/sync_custom.h"
   header "impl/codegen/sync_generic.h"
-  header "impl/codegen/sync_posix.h"
   header "grpc_security.h"
   header "byte_buffer.h"
   header "byte_buffer_reader.h"
@@ -65,6 +55,28 @@ framework module grpc {
   header "support/workaround_list.h"
   header "census.h"
 
+  textual header "support/atm_gcc_atomic.h"
+  textual header "support/atm_gcc_sync.h"
+  textual header "support/atm_windows.h"
+  textual header "support/sync_custom.h"
+  textual header "support/sync_posix.h"
+  textual header "support/sync_windows.h"
+  textual header "support/tls_gcc.h"
+  textual header "support/tls_msvc.h"
+  textual header "support/tls_pthread.h"
+  textual header "impl/codegen/atm_gcc_atomic.h"
+  textual header "impl/codegen/atm_gcc_sync.h"
+  textual header "impl/codegen/atm_windows.h"
+  textual header "impl/codegen/sync_custom.h"
+  textual header "impl/codegen/sync_posix.h"
+  textual header "impl/codegen/sync_windows.h"
+  textual header "impl/codegen/atm_gcc_atomic.h"
+  textual header "impl/codegen/atm_gcc_sync.h"
+  textual header "impl/codegen/atm_windows.h"
+  textual header "impl/codegen/sync_custom.h"
+  textual header "impl/codegen/sync_posix.h"
+  textual header "impl/codegen/sync_windows.h"
+
   export *
   module * { export * }
 }
diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec
index 37798ec3c6..c61afc1a8f 100644
--- a/src/objective-c/BoringSSL.podspec
+++ b/src/objective-c/BoringSSL.podspec
@@ -31,7 +31,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'BoringSSL'
-  version = '9.0'
+  version = '9.1'
   s.version  = version
   s.summary  = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
   # Adapted from the homepage:
@@ -67,9 +67,10 @@ Pod::Spec.new do |s|
   # "The name and email addresses of the library maintainers, not the Podspec maintainer."
   s.authors  = 'Adam Langley', 'David Benjamin', 'Matt Braithwaite'
 
+  major_version = version[0] + '.0'
   s.source = {
     :git => 'https://boringssl.googlesource.com/boringssl',
-    :tag => "version_for_cocoapods_#{version}",
+    :tag => "version_for_cocoapods_#{major_version}",
   }
 
   name = 'openssl'
@@ -186,6 +187,7 @@ Pod::Spec.new do |s|
     cat > include/openssl/BoringSSL.modulemap <<EOF
       framework module openssl {
         umbrella header "umbrella.h"
+        textual header "arm_arch.h"
         export *
         module * { export * }
       }
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index f3ac30c08d..5657df8521 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -31,19 +31,11 @@
     return [f for f in out if not f.startswith("third_party/nanopb/")]
 
   def grpc_public_headers(libs):
-    excluded_files = ["include/grpc/support/atm_gcc_sync.h",
-                      "include/grpc/support/atm_windows.h",
-                      "include/grpc/support/sync_windows.h",
-                      "include/grpc/support/tls_gcc.h",
-                      "include/grpc/support/tls_msvc.h",
-                      "include/grpc/impl/codegen/atm_gcc_sync.h",
-                      "include/grpc/impl/codegen/atm_windows.h",
-                      "include/grpc/impl/codegen/sync_windows.h"]
     out = []
     for lib in libs:
       if lib.name in ("grpc", "gpr"):
         out += lib.get('public_headers', [])
-    return [f for f in out if not f in excluded_files]
+    return out
 
   def grpc_private_headers(libs):
     out = []
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index 5c92f9f9c4..4b360cfb4c 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -65,10 +65,13 @@
     end
 
     s.subspec 'GID' do |ss|
+      ss.ios.deployment_target = '7.0'
+
       ss.header_mappings_dir = "#{src_dir}"
 
       ss.source_files = "#{src_dir}/GRPCCall+GID.{h,m}"
 
+      ss.dependency "#{s.name}/Main", version
       ss.dependency 'Google/SignIn'
     end
   end
diff --git a/templates/include/grpc/module.modulemap.template b/templates/include/grpc/module.modulemap.template
index 8edc4b56ac..e18bc3de50 100644
--- a/templates/include/grpc/module.modulemap.template
+++ b/templates/include/grpc/module.modulemap.template
@@ -1,31 +1,57 @@
 %YAML 1.2
 --- |
   <%!
+  # TODO (mxyan): Make this list from build.yaml
+  textual_headers = ["include/grpc/support/atm_gcc_atomic.h",
+                     "include/grpc/support/atm_gcc_sync.h",
+                     "include/grpc/support/atm_windows.h",
+                     "include/grpc/support/sync_custom.h",
+                     "include/grpc/support/sync_posix.h",
+                     "include/grpc/support/sync_windows.h",
+                     "include/grpc/support/tls_gcc.h",
+                     "include/grpc/support/tls_msvc.h",
+                     "include/grpc/support/tls_pthread.h",
+                     "include/grpc/impl/codegen/atm_gcc_atomic.h",
+                     "include/grpc/impl/codegen/atm_gcc_sync.h",
+                     "include/grpc/impl/codegen/atm_windows.h",
+                     "include/grpc/impl/codegen/sync_custom.h",
+                     "include/grpc/impl/codegen/sync_posix.h",
+                     "include/grpc/impl/codegen/sync_windows.h"]
+
   def grpc_public_headers_no_dir(libs):
-    excluded_files = ["include/grpc/support/atm_gcc_sync.h",
-                      "include/grpc/support/atm_windows.h",
-                      "include/grpc/support/sync_windows.h",
-                      "include/grpc/support/tls_gcc.h",
-                      "include/grpc/support/tls_msvc.h",
-                      "include/grpc/impl/codegen/atm_gcc_sync.h",
-                      "include/grpc/impl/codegen/atm_windows.h",
-                      "include/grpc/impl/codegen/sync_windows.h"]
     out = []
     for lib in libs:
       if lib.name in ("grpc", "gpr"):
         out += lib.get('public_headers', [])
-    out = [f for f in out if f not in excluded_files]
+    out = [f for f in out if f not in textual_headers]
+    out = [hdr.split('/', 2)[2] for hdr in out]
+    return out
+
+  # Generate the list of platform-specific headers as textual headers so that
+  # they are not built when the module is built but only when they are named by
+  # an #include directive.
+  def grpc_public_textual_headers_no_dir(libs):
+    out = []
+    for lib in libs:
+      if lib.name in ("grpc", "gpr"):
+        out += lib.get('public_headers', [])
+    out = [f for f in out if f in textual_headers]
     out = [hdr.split('/', 2)[2] for hdr in out]
     return out
 
   def header_lines(files):
     return ('\n  ').join('header "%s"' % f for f in files)
+
+  def textual_header_lines(files):
+    return ('\n  ').join('textual header "%s"' % f for f in files)
   %>
   framework module grpc {
     umbrella header "grpc.h"
 
     ${header_lines(grpc_public_headers_no_dir(libs))}
 
+    ${textual_header_lines(grpc_public_textual_headers_no_dir(libs))}
+
     export *
     module * { export * }
   }