From 1eb5673cdd2471cfa8f68dbe1123c35e9ee03574 Mon Sep 17 00:00:00 2001
From: apolcyn <apolcyn@google.com>
Date: Mon, 16 Sep 2024 12:35:34 -0700
Subject: [PATCH] [objc] backport https://github.com/grpc/grpc/pull/37690 to
 v1.67.x (#37712)

Backport https://github.com/grpc/grpc/pull/37690

cc @HannahShiSFB @sampajano

Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>
---
 src/objective-c/BoringSSL-GRPC.podspec               | 12 ++++--------
 src/objective-c/tests/Podfile                        |  2 +-
 .../src/objective-c/BoringSSL-GRPC.podspec.template  | 12 ++++--------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec
index 8620f238bf7..91dec47c6c3 100644
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
@@ -132,7 +132,7 @@ Pod::Spec.new do |s|
     ss.source_files = 'src/ssl/*.{h,c,cc}',
                       'src/ssl/**/*.{h,c,cc}',
                       'src/crypto/*.{h,c,cc}',
-                      'src/crypto/**/*.{h,c,cc}',
+                      'src/crypto/**/*.{h,c,cc,inc}',
                       # We have to include fiat because spake25519 depends on it
                       'src/third_party/fiat/*.{h,c,cc}',
                       # Include the err_data.c pre-generated in boringssl's master-with-bazel branch
@@ -143,11 +143,7 @@ Pod::Spec.new do |s|
                               'src/crypto/*.h',
                               'src/crypto/**/*.h',
                               'src/third_party/fiat/*.h'
-    # bcm.c includes other source files, creating duplicated symbols. Since it is not used, we
-    # explicitly exclude it from the pod.
-    # TODO (mxyan): Work with BoringSSL team to remove this hack.
-    ss.exclude_files = 'src/crypto/fipsmodule/bcm.c',
-                       'src/**/*_test.*',
+    ss.exclude_files = 'src/**/*_test.*',
                        'src/**/test_*.*',
                        'src/**/test/*.*'
 
@@ -713,10 +709,10 @@ Pod::Spec.new do |s|
     EOF
 
     # We are renaming openssl to openssl_grpc so that there is no conflict with openssl if it exists
-    find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
+    find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' -or -path '*.inc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
 
     # Include of boringssl_prefix_symbols.h does not follow Xcode import style. We add the package
     # name here so that Xcode knows where to find it.
-    find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <boringssl_prefix_symbols.h>;#include <openssl_grpc/boringssl_prefix_symbols.h>;g'
+    find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' -or -path '*.inc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <boringssl_prefix_symbols.h>;#include <openssl_grpc/boringssl_prefix_symbols.h>;g'
   END_OF_COMMAND
 end
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile
index 2c39d8ecbac..84f6db830a4 100644
--- a/src/objective-c/tests/Podfile
+++ b/src/objective-c/tests/Podfile
@@ -22,7 +22,7 @@ def grpc_deps
 end
 
 target 'TvTests' do
-  platform :tvos, '10.0'
+  platform :tvos, '12.0'
   grpc_deps
 end
 
diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
index 955a66199a5..274cd3c5f14 100644
--- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template
+++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
@@ -163,7 +163,7 @@
       ss.source_files = 'src/ssl/*.{h,c,cc}',
                         'src/ssl/**/*.{h,c,cc}',
                         'src/crypto/*.{h,c,cc}',
-                        'src/crypto/**/*.{h,c,cc}',
+                        'src/crypto/**/*.{h,c,cc,inc}',
                         # We have to include fiat because spake25519 depends on it
                         'src/third_party/fiat/*.{h,c,cc}',
                         # Include the err_data.c pre-generated in boringssl's master-with-bazel branch
@@ -174,11 +174,7 @@
                                 'src/crypto/*.h',
                                 'src/crypto/**/*.h',
                                 'src/third_party/fiat/*.h'
-      # bcm.c includes other source files, creating duplicated symbols. Since it is not used, we
-      # explicitly exclude it from the pod.
-      # TODO (mxyan): Work with BoringSSL team to remove this hack.
-      ss.exclude_files = 'src/crypto/fipsmodule/bcm.c',
-                         'src/**/*_test.*',
+      ss.exclude_files = 'src/**/*_test.*',
                          'src/**/test_*.*',
                          'src/**/test/*.*'
 
@@ -221,10 +217,10 @@
       EOF
 
       # We are renaming openssl to openssl_grpc so that there is no conflict with openssl if it exists
-      find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
+      find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' -or -path '*.inc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g'
 
       # Include of boringssl_prefix_symbols.h does not follow Xcode import style. We add the package
       # name here so that Xcode knows where to find it.
-      find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <boringssl_prefix_symbols.h>;#include <openssl_grpc/boringssl_prefix_symbols.h>;g'
+      find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' -or -path '*.inc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <boringssl_prefix_symbols.h>;#include <openssl_grpc/boringssl_prefix_symbols.h>;g'
     END_OF_COMMAND
   end