app with appclip plus symbols test

Author: adincebic

test/starlark_tests/ios_application_tests.bzl

@@ -727,16 +727,16 @@ def ios_application_test_suite(name):
     )
 
     # Tests that app clips also contribute .symbols package files when
-    # `include_symbols_in_bundle` is enabled on the embedding application.
+    # `include_symbols` is enabled on the wrapping archive target.
     apple_symbols_file_test(
         name = "{}_archive_contains_apple_symbols_files_with_app_clip_test".format(name),
         binary_paths = [
-            "Payload/app_with_app_clip_and_symbols_in_bundle.app/app_with_app_clip_and_symbols_in_bundle",
-            "Payload/app_with_app_clip_and_symbols_in_bundle.app/AppClips/app_clip.app/app_clip",
+            "Payload/app_with_app_clip.app/app_with_app_clip",
+            "Payload/app_with_app_clip.app/AppClips/app_clip.app/app_clip",
         ],
         build_type = "simulator",
         tags = [name],
-        target_under_test = "//test/starlark_tests/targets_under_test/ios:ipa_app_with_app_clip_and_symbols_in_bundle",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:ipa_app_with_app_clip_and_symbols",
     )
 
     # Tests that the archive contains .symbols package files generated from

test/starlark_tests/targets_under_test/ios/BUILD

@@ -1196,24 +1196,6 @@ ios_application(
     ],
 )
 
-ios_application(
-    name = "app_with_app_clip_and_symbols_in_bundle",
-    app_clips = [":app_clip"],
-    bundle_id = "com.google.example",
-    entitlements = "//test/starlark_tests/resources:entitlements.plist",
-    families = ["iphone"],
-    include_symbols_in_bundle = True,
-    infoplists = [
-        "//test/starlark_tests/resources:Info.plist",
-    ],
-    minimum_os_version = common.min_os_ios.appclip_support,
-    provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
-    tags = common.fixture_tags,
-    deps = [
-        "//test/starlark_tests/resources:objc_main_lib",
-    ],
-)
-
 ios_app_clip(
     name = "app_clip",
     bundle_id = "com.google.example.clip",
@@ -5910,15 +5892,15 @@ apple_archive(
 )
 
 apple_archive(
-    name = "ipa_app_with_app_clip_with_swift_support",
-    bundle = ":app_with_app_clip_with_swift_support",
+    name = "ipa_app_with_app_clip_and_symbols",
+    bundle = ":app_with_app_clip",
+    include_symbols = True,
     tags = common.fixture_tags,
 )
 
 apple_archive(
-    name = "ipa_app_with_app_clip_and_symbols_in_bundle",
-    bundle = ":app_with_app_clip_and_symbols_in_bundle",
-    include_symbols = True,
+    name = "ipa_app_with_app_clip_with_swift_support",
+    bundle = ":app_with_app_clip_with_swift_support",
     tags = common.fixture_tags,
 )