From 01ea71d06db6a8080adf41a4951f50849ae4fdba Mon Sep 17 00:00:00 2001
From: Luis Padron <heyluispadron@gmail.com>
Date: Fri, 9 Aug 2024 20:58:17 -0400
Subject: [PATCH] Fix bad docc argument for multiple symbol graphs (#2511)

---
 apple/internal/docc.bzl                          |  6 +++++-
 test/starlark_tests/docc_tests.bzl               | 15 ++++++++++++---
 test/starlark_tests/targets_under_test/ios/BUILD |  8 ++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/apple/internal/docc.bzl b/apple/internal/docc.bzl
index be9060c2de..4be96b7142 100644
--- a/apple/internal/docc.bzl
+++ b/apple/internal/docc.bzl
@@ -97,7 +97,11 @@ def _docc_archive_impl(ctx):
 
     # Add symbol graphs
     if symbol_graphs_info:
-        arguments.add_all("--additional-symbol-graph-dir", symbol_graphs_info.symbol_graphs, expand_directories = False)
+        arguments.add_all(
+            symbol_graphs_info.symbol_graphs,
+            before_each = "--additional-symbol-graph-dir",
+            expand_directories = False,
+        )
         docc_build_inputs.extend(symbol_graphs_info.symbol_graphs)
 
     # The .docc bundle (if provided, only one is allowed)
diff --git a/test/starlark_tests/docc_tests.bzl b/test/starlark_tests/docc_tests.bzl
index 15541c46e1..6c72ab948a 100644
--- a/test/starlark_tests/docc_tests.bzl
+++ b/test/starlark_tests/docc_tests.bzl
@@ -57,7 +57,6 @@ def docc_test_suite(name):
             "$BUNDLE_ROOT/index.html",
             "$BUNDLE_ROOT/documentation/basicframework/readme/index.html",
         ],
-        text_file_not_contains = [],
         text_test_file = "$BUNDLE_ROOT/metadata.json",
         text_test_values = [
             "\"bundleDisplayName\":\"BasicFramework\"",
@@ -78,7 +77,6 @@ def docc_test_suite(name):
             "$BUNDLE_ROOT/index.html",
             "$BUNDLE_ROOT/documentation/basiclib/readme/index.html",
         ],
-        text_file_not_contains = [],
         text_test_file = "$BUNDLE_ROOT/metadata.json",
         text_test_values = [
             "\"bundleDisplayName\":\"BasicLib\"",
@@ -99,7 +97,6 @@ def docc_test_suite(name):
             "$BUNDLE_ROOT/index.html",
             "$BUNDLE_ROOT/documentation/basicframework/readme/index.html",
         ],
-        text_file_not_contains = [],
         text_test_file = "$BUNDLE_ROOT/index.html",
         text_test_values = [
             "<script defer=\"defer\" src=\"/custom/base/path/js/",
@@ -108,6 +105,18 @@ def docc_test_suite(name):
         tags = [name],
     )
 
+    # Verifying multiple symbol graph conversion via transitive dependencies.
+    archive_contents_test(
+        name = "{}_contains_doccarchive_with_transitive_dependencies".format(name),
+        build_type = "simulator",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:basic_framework_with_transitive_dependency.doccarchive",
+        contains = [
+            "$BUNDLE_ROOT/index.html",
+            "$BUNDLE_ROOT/documentation/transitivedependencytest/index.html",
+        ],
+        tags = [name],
+    )
+
     native.test_suite(
         name = name,
         tags = [name],
diff --git a/test/starlark_tests/targets_under_test/ios/BUILD b/test/starlark_tests/targets_under_test/ios/BUILD
index b8b162284a..f3688d3b81 100644
--- a/test/starlark_tests/targets_under_test/ios/BUILD
+++ b/test/starlark_tests/targets_under_test/ios/BUILD
@@ -5039,6 +5039,14 @@ docc_archive(
     hosting_base_path = "custom/base/path",
 )
 
+docc_archive(
+    name = "basic_framework_with_transitive_dependency.doccarchive",
+    dep = ":basic_framework_with_transitive_dependency",
+    fallback_bundle_identifier = "com.google.example.framework",
+    fallback_bundle_version = "1.0",
+    fallback_display_name = "BasicFramework",
+)
+
 # ---------------------------------------------------------------------------------------
 # Target for extension resource bundling.