From dc583632fc18b9fc4db5d1e462d919919af5006a Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 8 Nov 2019 10:58:04 -0800
Subject: [PATCH] List err_data.c explicitly in source files

---
 src/objective-c/BoringSSL-GRPC.podspec                   | 9 +++++----
 .../src/objective-c/BoringSSL-GRPC.podspec.template      | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec
index c42ec88e92f..517c2e3e54b 100644
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
@@ -130,14 +130,15 @@ Pod::Spec.new do |s|
     ss.header_mappings_dir = '.'
     ss.source_files = 'ssl/*.{h,c,cc}',
                       'ssl/**/*.{h,c,cc}',
-                      '*.{h,c,cc}', # for generated file such as err_data.c
                       'crypto/*.{h,c,cc}',
                       'crypto/**/*.{h,c,cc}',
-                      'third_party/fiat/*.{h,c,cc}' # has to include fiat because spake25519 depends
-                                                    # on it
+                      # We have to include fiat because spake25519 depends on it
+                      'third_party/fiat/*.{h,c,cc}',
+                      # Include the err_data.c generated in prepare_command below
+                      'err_data.c'
+
     ss.private_header_files = 'ssl/*.h',
                               'ssl/**/*.h',
-                              '*.h',
                               'crypto/*.h',
                               'crypto/**/*.h',
                               'third_party/fiat/*.h'
diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
index adefc4f2ba9..3d0ca89f091 100644
--- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template
+++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
@@ -137,14 +137,15 @@
       ss.header_mappings_dir = '.'
       ss.source_files = 'ssl/*.{h,c,cc}',
                         'ssl/**/*.{h,c,cc}',
-                        '*.{h,c,cc}', # for generated file such as err_data.c
                         'crypto/*.{h,c,cc}',
                         'crypto/**/*.{h,c,cc}',
-                        'third_party/fiat/*.{h,c,cc}' # has to include fiat because spake25519 depends
-                                                      # on it
+                        # We have to include fiat because spake25519 depends on it
+                        'third_party/fiat/*.{h,c,cc}',
+                        # Include the err_data.c generated in prepare_command below
+                        'err_data.c'
+
       ss.private_header_files = 'ssl/*.h',
                                 'ssl/**/*.h',
-                                '*.h',
                                 'crypto/*.h',
                                 'crypto/**/*.h',
                                 'third_party/fiat/*.h'