From 8a6a8e89a941b772e540b9e5e3fa78df4bd6507f Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:55:27 +0200 Subject: [PATCH 1/7] Revert "Add force load libs to CcInfo linking context in Bazel 7 (#2)" This reverts commit fb395f987ab4be800add3c470345aec24196d29f. --- rules/BUILD.bazel | 1 - rules/force_load_direct_deps.bzl | 78 ++++++-------------------- rules/framework.bzl | 22 ++------ rules/internal/framework_middleman.bzl | 52 +---------------- rules/internal/objc_provider_utils.bzl | 7 +-- 5 files changed, 25 insertions(+), 135 deletions(-) diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel index 5d38e0bfc..4e73f9485 100644 --- a/rules/BUILD.bazel +++ b/rules/BUILD.bazel @@ -54,7 +54,6 @@ bzl_library( ":providers", ":transition_support", "@bazel_skylib//lib:dicts", - "@bazel_skylib//rules:common_settings", ], ) diff --git a/rules/force_load_direct_deps.bzl b/rules/force_load_direct_deps.bzl index ff30b4cc3..3e6fb4f8f 100644 --- a/rules/force_load_direct_deps.bzl +++ b/rules/force_load_direct_deps.bzl @@ -1,9 +1,9 @@ load("//rules:providers.bzl", "AvoidDepsInfo") load("//rules:transition_support.bzl", "transition_support") -def _force_load_direct_deps_impl(ctx): +def _impl(ctx): if not ctx.attr.should_force_load: - return [apple_common.new_objc_provider(), CcInfo()] + return apple_common.new_objc_provider() force_load = [] @@ -13,68 +13,24 @@ def _force_load_direct_deps_impl(ctx): avoid_deps.extend(dep[AvoidDepsInfo].libraries) avoid_libraries = {} + for dep in avoid_deps: + if apple_common.Objc in dep: + for lib in dep[apple_common.Objc].library.to_list(): + avoid_libraries[lib] = True - _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") - if _is_bazel_7: - for dep in avoid_deps: - if CcInfo in dep: - for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list(): - for lib in linker_input.libraries: - avoid_libraries[lib] = True - - force_load = [] - for dep in ctx.attr.deps: - if CcInfo in dep: - for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list(): - for lib in linker_input.libraries: - if not lib in avoid_libraries: - force_load.append(lib) - - static_libraries = [lib.static_library for lib in force_load if lib.static_library != None] - return [ - apple_common.new_objc_provider( - force_load_library = depset(static_libraries), - link_inputs = depset(static_libraries), - ), - CcInfo( - linking_context = cc_common.create_linking_context( - linker_inputs = depset([ - cc_common.create_linker_input( - owner = ctx.label, - libraries = depset([ - cc_common.create_library_to_link( - actions = ctx.actions, - static_library = lib, - alwayslink = True, - ) - for lib in static_libraries - ]), - additional_inputs = depset(static_libraries), - ), - ]), - ), - ), - ] - else: - for dep in avoid_deps: - if apple_common.Objc in dep: - for lib in dep[apple_common.Objc].library.to_list(): - avoid_libraries[lib] = True - force_load = [] - - for dep in ctx.attr.deps: - if apple_common.Objc in dep: - for lib in dep[apple_common.Objc].library.to_list(): - if not lib in avoid_libraries: - force_load.append(lib) - - return apple_common.new_objc_provider( - force_load_library = depset(force_load), - link_inputs = depset(force_load), - ) + force_load = [] + for dep in ctx.attr.deps: + if apple_common.Objc in dep: + for lib in dep[apple_common.Objc].library.to_list(): + if not lib in avoid_libraries: + force_load.append(lib) + return apple_common.new_objc_provider( + force_load_library = depset(force_load), + link_inputs = depset(force_load), + ) force_load_direct_deps = rule( - implementation = _force_load_direct_deps_impl, + implementation = _impl, attrs = { "deps": attr.label_list( cfg = transition_support.apple_platform_split_transition, diff --git a/rules/framework.bzl b/rules/framework.bzl index 209857303..e79fc95f7 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -1029,23 +1029,11 @@ def _apple_framework_packaging_impl(ctx): # If not virtualizing the framework - then it runs a "clean" _get_symlinked_framework_clean_action(ctx, framework_files, compilation_context_fields) - _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") - if _is_bazel_7: - cc_info_provider = CcInfo( - compilation_context = cc_common.create_compilation_context( - **compilation_context_fields - ), - linking_context = cc_common.merge_cc_infos( - direct_cc_infos = [], - cc_infos = [dep[CcInfo] for dep in deps], - ).linking_context, - ) - else: - cc_info_provider = CcInfo( - compilation_context = cc_common.create_compilation_context( - **compilation_context_fields - ), - ) + cc_info_provider = CcInfo( + compilation_context = cc_common.create_compilation_context( + **compilation_context_fields + ), + ) if virtualize_frameworks: cc_info = cc_common.merge_cc_infos(direct_cc_infos = [cc_info_provider]) diff --git a/rules/internal/framework_middleman.bzl b/rules/internal/framework_middleman.bzl index 22cb19c76..b4d14d646 100644 --- a/rules/internal/framework_middleman.bzl +++ b/rules/internal/framework_middleman.bzl @@ -6,9 +6,6 @@ load( "new_applebundleinfo", "new_iosframeworkbundleinfo", ) -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") -load("@bazel_skylib//lib:dicts.bzl", "dicts") -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load( "@build_bazel_rules_apple//apple/internal:partials.bzl", "partials", @@ -34,10 +31,7 @@ load( "//rules/internal:objc_provider_utils.bzl", "objc_provider_utils", ) -load( - "//rules:transition_support.bzl", - "transition_support", -) +load("//rules:transition_support.bzl", "transition_support") def _framework_middleman(ctx): resource_providers = [] @@ -79,48 +73,12 @@ def _framework_middleman(ctx): ]) # Add the frameworks to the linker command - _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") - dynamic_framework_provider = objc_provider_utils.merge_dynamic_framework_providers( - dynamic_framework_providers, - supports_cc_info_in_dynamic_framework_provider = _is_bazel_7, - ) + dynamic_framework_provider = objc_provider_utils.merge_dynamic_framework_providers(dynamic_framework_providers) objc_provider_fields["dynamic_framework_file"] = depset( transitive = [dynamic_framework_provider.framework_files, objc_provider_fields.get("dynamic_framework_file", depset([]))], ) objc_provider = apple_common.new_objc_provider(**objc_provider_fields) - cc_info_provider = cc_common.merge_cc_infos(direct_cc_infos = [], cc_infos = cc_providers) - if _is_bazel_7: - cc_toolchain = find_cpp_toolchain(ctx) - cc_features = cc_common.configure_features( - ctx = ctx, - cc_toolchain = cc_toolchain, - language = "objc", - requested_features = ctx.features, - unsupported_features = ctx.disabled_features, - ) - dynamic_framework_libraries_to_link = [ - cc_common.create_library_to_link( - actions = ctx.actions, - feature_configuration = cc_features, - cc_toolchain = cc_toolchain, - dynamic_library = dynamic_library, - ) - for dynamic_library in objc_provider_fields["dynamic_framework_file"].to_list() - ] - cc_info_provider = cc_common.merge_cc_infos( - direct_cc_infos = [ - CcInfo( - linking_context = cc_common.create_linking_context( - linker_inputs = depset([cc_common.create_linker_input( - owner = ctx.label, - libraries = depset(dynamic_framework_libraries_to_link), - )]), - ), - ), - ] + cc_providers, - ) - providers = [ dynamic_framework_provider, cc_info_provider, @@ -162,8 +120,6 @@ def _framework_middleman(ctx): framework_middleman = rule( implementation = _framework_middleman, - fragments = ["cpp"], - toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], attrs = { "framework_deps": attr.label_list( cfg = transition_support.apple_platform_split_transition, @@ -235,13 +191,9 @@ def _dep_middleman(ctx): cc_providers = [] avoid_libraries = {} - _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") - def _collect_providers(lib_dep): if apple_common.Objc in lib_dep: objc_providers.append(lib_dep[apple_common.Objc]) - if _is_bazel_7 and CcInfo in lib_dep: - cc_providers.append(lib_dep[CcInfo]) def _process_avoid_deps(avoid_dep_libs): for dep in avoid_dep_libs: diff --git a/rules/internal/objc_provider_utils.bzl b/rules/internal/objc_provider_utils.bzl index de9a6793e..cba49ae47 100644 --- a/rules/internal/objc_provider_utils.bzl +++ b/rules/internal/objc_provider_utils.bzl @@ -37,7 +37,7 @@ def _merge_objc_providers(providers, transitive = []): ) return apple_common.new_objc_provider(**objc_provider_fields) -def _merge_dynamic_framework_providers(dynamic_framework_providers, supports_cc_info_in_dynamic_framework_provider): +def _merge_dynamic_framework_providers(dynamic_framework_providers): fields = {} merge_keys = [ "framework_dirs", @@ -53,11 +53,6 @@ def _merge_dynamic_framework_providers(dynamic_framework_providers, supports_cc_ fields["objc"] = apple_common.new_objc_provider() - if not supports_cc_info_in_dynamic_framework_provider: - fields.pop("cc_info", None) - elif "cc_info" not in fields: - fields["cc_info"] = CcInfo() - return apple_common.new_dynamic_framework_provider(**fields) objc_provider_utils = struct( From 19537b6cf5b0853407ffa54a858f0cd873ba79ec Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:56:05 +0200 Subject: [PATCH 2/7] Revert "Re-add ios_multi_cpus transition setting from rules_ios (#856)" This reverts commit 6d6e0514287b635e504f0d930e9771baa5703d05. --- rules/transition_support.bzl | 12 ----- .../project.pbxproj | 32 ++++++------- .../project.pbxproj | 16 +++---- .../project.pbxproj | 4 +- .../project.pbxproj | 48 +++++++++---------- .../project.pbxproj | 20 ++++---- .../project.pbxproj | 16 +++---- .../project.pbxproj | 20 ++++---- .../TestWithHostApp.xcodeproj/project.pbxproj | 12 ++--- .../project.pbxproj | 4 +- .../project.pbxproj | 8 ++-- .../project.pbxproj | 8 ++-- .../project.pbxproj | 20 ++++---- 13 files changed, 104 insertions(+), 116 deletions(-) diff --git a/rules/transition_support.bzl b/rules/transition_support.bzl index ee0ad925e..218cefbaf 100644 --- a/rules/transition_support.bzl +++ b/rules/transition_support.bzl @@ -292,12 +292,6 @@ def _command_line_options( settings = settings, ) - # PATCH: start - rules_ios sets ios_multi_cpus - # Transition ios_multi_cpus to to a single cpu when building for iOS. - # Rules using this transition (e.g., apple_framework_packaging, precompiled_apple_resource_bundle) don't need any artifacts from other archs. - ios_multi_cpus = cpu[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"] - # PATCH: end - default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]] if _is_bazel_7 else [] return { build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs], @@ -320,9 +314,6 @@ def _command_line_options( platform = "ios", platform_type = platform_type, ), - # PATCH: start - rules_ios sets ios_multi_cpus - "//command_line_option:ios_multi_cpus": ios_multi_cpus, - # PATCH: end "//command_line_option:macos_minimum_os": _min_os_version_or_none( minimum_os_version = minimum_os_version, platform = "macos", @@ -393,9 +384,6 @@ _apple_rule_base_transition_outputs = [ "//command_line_option:fission", "//command_line_option:grte_top", "//command_line_option:ios_minimum_os", - # PATCH: start - rules_ios sets ios_multi_cpus - "//command_line_option:ios_multi_cpus", - # PATCH: end "//command_line_option:macos_minimum_os", "//command_line_option:minimum_os_version", "//command_line_option:platforms", diff --git a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj index 8e6f650fe..7815a0d70 100755 --- a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj @@ -300,7 +300,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -320,9 +320,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -342,7 +342,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -365,7 +365,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -390,7 +390,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -452,9 +452,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -476,7 +476,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -536,7 +536,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -599,9 +599,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -663,7 +663,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -683,7 +683,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -706,9 +706,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj index bad842a3a..cd548429d 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -357,10 +357,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -381,10 +381,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -406,10 +406,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -431,10 +431,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index b3f1a179c..834e24e41 100755 --- a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -244,7 +244,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj index eb6876148..3b8260819 100755 --- a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj @@ -401,12 +401,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -464,12 +464,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -490,7 +490,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -512,12 +512,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -538,7 +538,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -560,12 +560,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -621,12 +621,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -644,12 +644,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -666,12 +666,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -689,12 +689,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index c7b71370f..7d1a56bd8 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -406,9 +406,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -455,7 +455,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -477,7 +477,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -539,7 +539,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -584,7 +584,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -609,9 +609,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -631,7 +631,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -658,7 +658,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index a07c878b6..5330d6996 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -375,7 +375,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -492,7 +492,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -552,7 +552,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -572,9 +572,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -594,9 +594,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj index 2d5f201d8..18f7a1d36 100755 --- a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -523,7 +523,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -550,7 +550,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -633,7 +633,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -660,7 +660,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -722,7 +722,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -742,9 +742,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -764,9 +764,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj index a4ef6c749..29eb5dee4 100755 --- a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -517,7 +517,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -564,7 +564,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -651,7 +651,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -700,7 +700,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -724,7 +724,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index 94948e73e..6c5f64452 100755 --- a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -244,7 +244,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj index 155f7a2f8..8db7776ab 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -423,7 +423,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -446,7 +446,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -469,7 +469,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj index 11cd0abd3..27cbce1b1 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -295,7 +295,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -406,7 +406,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -469,7 +469,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj index 6b6913732..5b1dd8663 100644 --- a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj @@ -412,10 +412,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -436,7 +436,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -460,10 +460,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -485,10 +485,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -534,10 +534,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -637,7 +637,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-008b8551197e/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; From 516adfe101e8126ba1de1e1c49ffffe41c1fb5fe Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:56:11 +0200 Subject: [PATCH 3/7] Revert "Safer objc_provider assignment in apple_framework_packaging (#855)" This reverts commit 30733daa5c3f740d9e4cc3394fdb864e9a6caffa. --- rules/framework.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/framework.bzl b/rules/framework.bzl index e79fc95f7..b48664087 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -1067,8 +1067,8 @@ def _apple_framework_packaging_impl(ctx): default_info = DefaultInfo(files = depset(out_files + bundle_outs.files.to_list())) objc_provider = objc_provider_utils.merge_objc_providers( - providers = [dep[apple_common.Objc] for dep in deps if apple_common.Objc in dep], - transitive = [dep[apple_common.Objc] for dep in transitive_deps if apple_common.Objc in dep], + providers = [dep[apple_common.Objc] for dep in deps], + transitive = [dep[apple_common.Objc] for dep in transitive_deps], ) return [ avoid_deps_info, From b25f514f8f4f7255948fde0821e3292662e20598 Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:56:31 +0200 Subject: [PATCH 4/7] Revert "Forward package_name to swift_library part of apple_library (#853)" This reverts commit 3b0ca4c0d09576d92dc529ac09c556bfe937fb03. --- rules/library.bzl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/rules/library.bzl b/rules/library.bzl index 1d86073c6..0a407b9b0 100644 --- a/rules/library.bzl +++ b/rules/library.bzl @@ -27,12 +27,6 @@ GLOBAL_INDEX_STORE_PATH = "bazel-out/_global_index_store" _MANUAL = ["manual"] -_SWIFT_LIBRARY_KWARGS = [ - "always_include_developer_search_paths", - "package_name", - "plugins", -] - def _private_headers_impl(ctx): return [ PrivateHeadersInfo( @@ -584,10 +578,8 @@ def apple_library( defines = kwargs.pop("defines", []) testonly = kwargs.pop("testonly", False) features = kwargs.pop("features", []) - - # Collect the swift_library related kwargs, these are typically only set when provided to allow - # for wider compatibility with rule_swift versions. - swift_kwargs = {arg: kwargs.pop(arg) for arg in _SWIFT_LIBRARY_KWARGS if arg in kwargs} + plugins = kwargs.pop("plugins", None) + always_include_developer_search_paths = kwargs.pop("always_include_developer_search_paths", None) for (k, v) in {"momc_copts": momc_copts, "mapc_copts": mapc_copts, "ibtool_copts": ibtool_copts}.items(): if v: @@ -966,8 +958,16 @@ def apple_library( ) if swift_sources: - # Forward the kwargs and the swift specific kwargs to the swift_library - swift_library_kwargs = dicts.add(kwargs, swift_kwargs) + swift_kwargs = kwargs + + # To be backward compatible with rules_apple 2.x + if plugins: + swift_kwargs = dicts.add(swift_kwargs, {"plugins": plugins}) + + # Allow consumers to opt-in to https://github.com/bazelbuild/rules_swift/pull/1162 + if always_include_developer_search_paths: + swift_kwargs = dicts.add(swift_kwargs, {"always_include_developer_search_paths": always_include_developer_search_paths}) + swift_library( name = swift_libname, module_name = module_name, @@ -993,7 +993,7 @@ def apple_library( tags = tags_manual, defines = defines + swift_defines, testonly = testonly, - **swift_library_kwargs + **swift_kwargs ) lib_names.append(swift_libname) From ad30a269ee24a13a8d4c00ce73a83d82e21942dc Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:56:38 +0200 Subject: [PATCH 5/7] Revert "Allow consumers to set always_include_developer_search_paths in swift_library (#852)" This reverts commit da630a25bbdea2ad1edd717da8bb52c2d182d30c. --- rules/library.bzl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/rules/library.bzl b/rules/library.bzl index 0a407b9b0..4a716e4f7 100644 --- a/rules/library.bzl +++ b/rules/library.bzl @@ -579,7 +579,6 @@ def apple_library( testonly = kwargs.pop("testonly", False) features = kwargs.pop("features", []) plugins = kwargs.pop("plugins", None) - always_include_developer_search_paths = kwargs.pop("always_include_developer_search_paths", None) for (k, v) in {"momc_copts": momc_copts, "mapc_copts": mapc_copts, "ibtool_copts": ibtool_copts}.items(): if v: @@ -958,15 +957,8 @@ def apple_library( ) if swift_sources: - swift_kwargs = kwargs - # To be backward compatible with rules_apple 2.x - if plugins: - swift_kwargs = dicts.add(swift_kwargs, {"plugins": plugins}) - - # Allow consumers to opt-in to https://github.com/bazelbuild/rules_swift/pull/1162 - if always_include_developer_search_paths: - swift_kwargs = dicts.add(swift_kwargs, {"always_include_developer_search_paths": always_include_developer_search_paths}) + swift_kwargs = dicts.add(kwargs, {"plugins": plugins} if plugins else {}) swift_library( name = swift_libname, From 75e39574f98675dfe0bd3e6ba802b4844f2b4b36 Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:56:51 +0200 Subject: [PATCH 6/7] Revert "Update transition support (#847)" This reverts commit 144eb18543fd0d61cb6ca4d6318c8068a0e1e476. --- docs/transition_support_doc.md | 16 - rules/BUILD.bazel | 1 - rules/force_load_direct_deps.bzl | 2 +- rules/framework.bzl | 14 +- rules/internal/framework_middleman.bzl | 4 +- rules/transition_support.bzl | 612 +++++++----------- .../project.pbxproj | 32 +- .../project.pbxproj | 20 +- .../project.pbxproj | 16 +- .../project.pbxproj | 4 +- .../project.pbxproj | 48 +- .../project.pbxproj | 20 +- .../project.pbxproj | 16 +- .../project.pbxproj | 20 +- .../TestWithHostApp.xcodeproj/project.pbxproj | 12 +- .../project.pbxproj | 4 +- .../project.pbxproj | 8 +- .../project.pbxproj | 8 +- .../project.pbxproj | 20 +- 19 files changed, 356 insertions(+), 521 deletions(-) diff --git a/docs/transition_support_doc.md b/docs/transition_support_doc.md index 152950121..749c31a31 100755 --- a/docs/transition_support_doc.md +++ b/docs/transition_support_doc.md @@ -2,22 +2,6 @@ Starlark transition support for Apple rules. -This module makes the following distinctions around Apple CPU-adjacent values for clarity, based in -part on the language used for XCFramework library identifiers: - -- `architecture`s or "arch"s represent the type of binary slice ("arm64", "x86_64"). - -- `environment`s represent a platform variant ("device", "sim"). These sometimes appear in the "cpu" - keys out of necessity to distinguish new "cpu"s from an existing Apple "cpu" when a new - Crosstool-provided toolchain is established. - -- `platform_type`s represent the Apple OS being built for ("ios", "macos", "tvos", "visionos", - "watchos"). - -- `cpu`s are keys to match a Crosstool-provided toolchain ("ios_sim_arm64", "ios_x86_64"). - Essentially it is a raw key that implicitly references the other three values for the purpose of - getting the right Apple toolchain to build outputs with from the Apple Crosstool. - ## transition_support.current_apple_platform diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel index 4e73f9485..3d3e1d7b8 100644 --- a/rules/BUILD.bazel +++ b/rules/BUILD.bazel @@ -23,7 +23,6 @@ bzl_library( visibility = ["//visibility:public"], deps = [ "@build_bazel_apple_support//configs:platforms", - "@build_bazel_rules_apple//apple", ], ) diff --git a/rules/force_load_direct_deps.bzl b/rules/force_load_direct_deps.bzl index 3e6fb4f8f..1fd540e16 100644 --- a/rules/force_load_direct_deps.bzl +++ b/rules/force_load_direct_deps.bzl @@ -33,7 +33,7 @@ force_load_direct_deps = rule( implementation = _impl, attrs = { "deps": attr.label_list( - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, mandatory = True, doc = "Deps", diff --git a/rules/framework.bzl b/rules/framework.bzl index b48664087..da09884d0 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -1094,7 +1094,7 @@ apple_framework_packaging = rule( ), "deps": attr.label_list( mandatory = True, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, aspects = [apple_resource_aspect], doc = """Objc or Swift rules to be packed by the framework rule @@ -1102,7 +1102,7 @@ apple_framework_packaging = rule( ), "private_deps": attr.label_list( mandatory = False, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, aspects = [apple_resource_aspect], doc = """Objc or Swift private rules to be packed by the framework rule @@ -1110,7 +1110,7 @@ apple_framework_packaging = rule( ), "data": attr.label_list( mandatory = False, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, allow_files = True, doc = """Objc or Swift rules to be packed by the framework rule @@ -1132,7 +1132,7 @@ The default behavior bakes this into the top level app. When false, it's statica ), "vfs": attr.label_list( mandatory = False, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, doc = """Additional VFS for the framework to export """, @@ -1140,7 +1140,7 @@ The default behavior bakes this into the top level app. When false, it's statica "transitive_deps": attr.label_list( aspects = [swift_clang_module_aspect], mandatory = True, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, doc = """Deps of the deps """, @@ -1185,7 +1185,7 @@ A list of framework targets (see [`ios_framework`](https://github.com/bazelbuild/rules_apple/blob/master/doc/rules-ios.md#ios_framework)) that this target depends on. """, - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, ), "_headermap_builder": attr.label( executable = True, @@ -1204,7 +1204,7 @@ that this target depends on. """, ), "_child_configuration_dummy": attr.label( - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, providers = [cc_common.CcToolchainInfo, ApplePlatformInfo], default = Label("@build_bazel_rules_apple//apple:default_cc_toolchain_forwarder"), ), diff --git a/rules/internal/framework_middleman.bzl b/rules/internal/framework_middleman.bzl index b4d14d646..25a683069 100644 --- a/rules/internal/framework_middleman.bzl +++ b/rules/internal/framework_middleman.bzl @@ -122,7 +122,7 @@ framework_middleman = rule( implementation = _framework_middleman, attrs = { "framework_deps": attr.label_list( - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, mandatory = True, doc = """Deps that may contain frameworks @@ -260,7 +260,7 @@ dep_middleman = rule( implementation = _dep_middleman, attrs = { "deps": attr.label_list( - cfg = transition_support.apple_platform_split_transition, + cfg = transition_support.split_transition, mandatory = True, doc = """Deps that may contain frameworks diff --git a/rules/transition_support.bzl b/rules/transition_support.bzl index 218cefbaf..00bf2ac50 100644 --- a/rules/transition_support.bzl +++ b/rules/transition_support.bzl @@ -1,37 +1,9 @@ -""" -Starlark transition support for Apple rules. - -This module makes the following distinctions around Apple CPU-adjacent values for clarity, based in -part on the language used for XCFramework library identifiers: - -- `architecture`s or "arch"s represent the type of binary slice ("arm64", "x86_64"). - -- `environment`s represent a platform variant ("device", "sim"). These sometimes appear in the "cpu" - keys out of necessity to distinguish new "cpu"s from an existing Apple "cpu" when a new - Crosstool-provided toolchain is established. - -- `platform_type`s represent the Apple OS being built for ("ios", "macos", "tvos", "visionos", - "watchos"). - -- `cpu`s are keys to match a Crosstool-provided toolchain ("ios_sim_arm64", "ios_x86_64"). - Essentially it is a raw key that implicitly references the other three values for the purpose of - getting the right Apple toolchain to build outputs with from the Apple Crosstool. -""" - -# NOTE: this is essentially a copy of transition_support from rules_apple. -# see the `PATCH:` comments for the changes made to the original file. +"""Starlark transition support for Apple rules.""" load( "@build_bazel_apple_support//configs:platforms.bzl", "CPU_TO_DEFAULT_PLATFORM_NAME", ) -load( - "@build_bazel_rules_apple//apple/build_settings:build_settings.bzl", - "build_settings_labels", -) - -_supports_visionos = hasattr(apple_common.platform_type, "visionos") -_is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") _PLATFORM_TYPE_TO_CPUS_FLAG = { "ios": "//command_line_option:ios_multi_cpus", @@ -48,7 +20,6 @@ _CPU_TO_DEFAULT_PLATFORM_FLAG = { for cpu, platform_name in CPU_TO_DEFAULT_PLATFORM_NAME.items() } -# PATCH: start - this function is specific to rules_ios def _current_apple_platform(apple_fragment, xcode_config): """Returns a struct containing the platform and target os version""" platform = apple_fragment.single_arch_platform @@ -61,110 +32,15 @@ def _current_apple_platform(apple_fragment, xcode_config): target_os_version = target_os_version, ) -# PATCH: end - -# PATCH: start - private helper to get the `platform_type` from the rules_ios attributes. -def _rules_ios_platform_type(settings, attr): - platform_type = str(settings["//command_line_option:apple_platform_type"]) - attr_platform_type = getattr(attr, "platform_type", None) - attr_platforms = getattr(attr, "platforms", None) - fail_on_apple_rule_transition_platform_mismatches = getattr(attr, "fail_on_apple_rule_transition_platform_mismatches", False) - if attr_platform_type and attr_platform_type != platform_type: - if fail_on_apple_rule_transition_platform_mismatches: - fail("ERROR: {}: attribute platform_type set to {}, but inferred to be {}".format(attr.name, attr_platform_type, platform_type)) - platform_type = attr_platform_type - - if attr_platforms and platform_type not in attr_platforms: - if fail_on_apple_rule_transition_platform_mismatches: - fail("ERROR: {}: attribute platforms set to {}, but platform inferred to be {}".format(attr.name, attr_platforms, platform_type)) - platform_type = attr_platforms.keys()[0] - - if not platform_type: - fail("ERROR: platform_type not found") - - return platform_type - -# PATCH: end - -# PATCH: start - private helper to get the `minimum_os_version` from the rules_ios attributes. -def _rules_ios_minimum_os_version(platform_type, attr): - platforms = getattr(attr, "platforms", None) - - if platforms: - return platforms[platform_type] if (platform_type in platforms and platforms[platform_type] != "") else None - - if hasattr(attr, "minimum_os_version"): - return attr.minimum_os_version if attr.minimum_os_version != "" else None +def _cpu_string(environment_arch, platform_type, settings): + """Generates a _ string for the current target based on the given parameters.""" - return None - -# PATCH: end - -def _platform_specific_cpu_setting_name(platform_type): - """Returns the name of a platform-specific CPU setting. - - Args: - platform_type: A string denoting the platform type; `"ios"`, `"macos"`, `"tvos"`, - "visionos", or `"watchos"`. - - Returns: - The `"//command_line_option:..."` string that is used as the key for the CPUs flag of the - given platform in settings dictionaries. This function never returns `None`; if the - platform type is invalid, the build fails. - """ - flag = _PLATFORM_TYPE_TO_CPUS_FLAG.get(platform_type, None) - if not flag: - fail("ERROR: Unknown platform type: {}".format(platform_type)) - return flag + # If the cpu value has already been transformed to the correct value, we must not change it anymore. + # Otherwise, we may build for the wrong arch. + cpu_value = settings["//command_line_option:cpu"] + if (platform_type == "macos" and cpu_value.startswith("%s_" % platform_type)) or cpu_value.startswith("%s_" % platform_type): + return cpu_value -def _environment_archs(platform_type, settings): - """Returns a full set of environment archs from the incoming command line options. - - Args: - platform_type: A string denoting the platform type; `"ios"`, `"macos"`, - `"tvos"`, `"visionos"`, or `"watchos"`. - settings: A dictionary whose set of keys is defined by the inputs parameter, typically from - the settings argument found on the implementation function of the current Starlark - transition. - - Returns: - A list of valid Apple environments with its architecture as a string (for example - `sim_arm64` from `ios_sim_arm64`, or `arm64` from `ios_arm64`). - """ - environment_archs = settings[_platform_specific_cpu_setting_name(platform_type)] - if not environment_archs: - if platform_type == "ios": - # Legacy exception to interpret the --cpu as an iOS arch. - cpu_value = settings["//command_line_option:cpu"] - if cpu_value.startswith("ios_"): - environment_archs = [cpu_value[4:]] - if not environment_archs: - environment_archs = [ - _cpu_string( - environment_arch = None, - platform_type = platform_type, - settings = settings, - ).split("_", 1)[1], - ] - return environment_archs - -def _cpu_string(*, environment_arch, platform_type, settings = {}): - """Generates a __ string for the current target based on args. - - Args: - environment_arch: A valid Apple environment when applicable with its architecture as a - string (for example `sim_arm64` from `ios_sim_arm64`, or `arm64` from `ios_arm64`), or - None to infer a value from command line options passed through settings. - platform_type: The Apple platform for which the rule should build its targets (`"ios"`, - `"macos"`, `"tvos"`, `"visionos"`, or `"watchos"`). - settings: A dictionary whose set of keys is defined by the inputs parameter, typically from - the settings argument found on the implementation function of the current Starlark - transition. If not defined, defaults to an empty dictionary. Used as a fallback if the - `environment_arch` argument is None. - - Returns: - A _ string defined for the current target. - """ if platform_type == "ios": if environment_arch: return "ios_{}".format(environment_arch) @@ -214,280 +90,229 @@ def _cpu_string(*, environment_arch, platform_type, settings = {}): fail("ERROR: Unknown platform type: {}".format(platform_type)) -def _min_os_version_or_none(*, minimum_os_version, platform, platform_type): - if platform_type == platform: - return minimum_os_version - return None +def _min_os_version_or_none(attr, attr_platforms, platform, attr_platform_type): + if attr_platform_type != platform: + return None -def _is_arch_supported_for_target_tuple(*, environment_arch, minimum_os_version, platform_type): - """Indicates if the environment_arch selected is supported for the given platform and min os. - - Args: - environment_arch: A valid Apple environment when applicable with its architecture as a - string (for example `sim_arm64` from `ios_sim_arm64`, or `arm64` from `ios_arm64`), or - None to infer a value from command line options passed through settings. - minimum_os_version: A string representing the minimum OS version specified for this - platform, represented as a dotted version number (for example, `"9.0"`). - platform_type: The Apple platform for which the rule should build its targets (`"ios"`, - `"macos"`, `"tvos"`, `"visionos"`, or `"watchos"`). - - Returns: - True if the architecture is supported for the given config, False otherwise. - """ - - # PATCH: start - this returns true when the minimum_os_version is empty in rules_ios - if not minimum_os_version: - return True + if attr_platforms != None: + return attr_platforms[platform] if (platform in attr_platforms and attr_platforms[platform] != "") else None - # PATCH: end - - dotted_minimum_os_version = apple_common.dotted_version(minimum_os_version) - - if (environment_arch == "armv7k" and platform_type == "watchos" and - dotted_minimum_os_version >= apple_common.dotted_version("9.0")): - return False + if hasattr(attr, "minimum_os_version"): + return attr.minimum_os_version if attr.minimum_os_version != "" else None - return True + return None -def _command_line_options( - *, - apple_platforms = [], - emit_swiftinterface = False, - environment_arch = None, - force_bundle_outputs = False, - minimum_os_version, - platform_type, - settings): - """Generates a dictionary of command line options suitable for the current target. - - Args: - apple_platforms: A list of labels referencing platforms if any should be set by the current - rule. This will be applied directly to `apple_platforms` to allow for forwarding - multiple platforms to rules evaluated after the transition is applied, and only the - first element will be applied to `platforms` as that will be what is resolved by the - underlying rule. Defaults to an empty list, which will signal to Bazel that platform - mapping can take place as a fallback measure. - emit_swiftinterface: Wheither to emit swift interfaces for the given target. Defaults to - `False`. - environment_arch: A valid Apple environment when applicable with its architecture as a - string (for example `sim_arm64` from `ios_sim_arm64`, or `arm64` from `ios_arm64`), or - None to infer a value from command line options passed through settings. - force_bundle_outputs: Indicates if the rule should always emit tree artifact outputs, which - are effectively bundles that aren't enclosed within a zip file (ipa). If not `True`, - this will be set to the incoming value instead. Defaults to `False`. - minimum_os_version: A string representing the minimum OS version specified for this - platform, represented as a dotted version number (for example, `"9.0"`). - platform_type: The Apple platform for which the rule should build its targets (`"ios"`, - `"macos"`, `"tvos"`, `"visionos"`, or `"watchos"`). - settings: A dictionary whose set of keys is defined by the inputs parameter, typically from - the settings argument found on the implementation function of the current Starlark - transition. - - Returns: - A dictionary of `"//command_line_option"`s defined for the current target. - """ +def _apple_platforms_base_values(settings, platform_type): cpu = _cpu_string( - environment_arch = environment_arch, + environment_arch = None, platform_type = platform_type, settings = settings, ) - - default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]] if _is_bazel_7 else [] + apple_platforms_value = settings["//command_line_option:apple_platforms"] + apple_platforms = apple_platforms_value if apple_platforms_value else [] return { - build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs], + "//command_line_option:apple_platforms": apple_platforms, + "//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]], + } + +def _apple_rule_transition_impl(settings, attr): + """Rule transition for Apple rules.""" + platform_type = str(settings["//command_line_option:apple_platform_type"]) + attr_platform_type = getattr(attr, "platform_type", None) + attr_platforms = getattr(attr, "platforms", None) + fail_on_apple_rule_transition_platform_mismatches = getattr(attr, "fail_on_apple_rule_transition_platform_mismatches", False) + if attr_platform_type and attr_platform_type != platform_type: + if fail_on_apple_rule_transition_platform_mismatches: + fail("ERROR: {}: attribute platform_type set to {}, but inferred to be {}".format(attr.name, attr_platform_type, platform_type)) + platform_type = attr_platform_type + + if attr_platforms and platform_type not in attr_platforms: + if fail_on_apple_rule_transition_platform_mismatches: + fail("ERROR: {}: attribute platforms set to {}, but platform inferred to be {}".format(attr.name, attr_platforms, platform_type)) + platform_type = attr_platforms.keys()[0] + + cpu_string = _cpu_string(None, platform_type, settings) + + # Transition ios_multi_cpus to to a single cpu when building for iOS. + # Rules using this transition (e.g., apple_framework_packaging, precompiled_apple_resource_bundle) don't need any artifacts from other archs. + ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"] + + ret = { "//command_line_option:apple configuration distinguisher": "applebin_" + platform_type, "//command_line_option:apple_platform_type": platform_type, - "//command_line_option:apple_platforms": apple_platforms, - # `apple_split_cpu` is used by the Bazel Apple configuration distinguisher to distinguish - # architecture and environment, therefore we set `environment_arch` when it is available. - "//command_line_option:apple_split_cpu": environment_arch if environment_arch else "", + "//command_line_option:apple_split_cpu": settings["//command_line_option:apple_split_cpu"], "//command_line_option:compiler": None, - "//command_line_option:cpu": cpu, + "//command_line_option:cpu": cpu_string, "//command_line_option:crosstool_top": ( settings["//command_line_option:apple_crosstool_top"] ), "//command_line_option:fission": [], "//command_line_option:grte_top": None, - "//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else default_platforms, - "//command_line_option:ios_minimum_os": _min_os_version_or_none( - minimum_os_version = minimum_os_version, - platform = "ios", - platform_type = platform_type, - ), - "//command_line_option:macos_minimum_os": _min_os_version_or_none( - minimum_os_version = minimum_os_version, - platform = "macos", - platform_type = platform_type, - ), - "//command_line_option:minimum_os_version": minimum_os_version, - "//command_line_option:tvos_minimum_os": _min_os_version_or_none( - minimum_os_version = minimum_os_version, - platform = "tvos", - platform_type = platform_type, - ), - "//command_line_option:watchos_minimum_os": _min_os_version_or_none( - minimum_os_version = minimum_os_version, - platform = "watchos", - platform_type = platform_type, - ), - "@build_bazel_rules_swift//swift:emit_swiftinterface": emit_swiftinterface, + "//command_line_option:ios_minimum_os": _min_os_version_or_none(attr, attr_platforms, "ios", platform_type), + "//command_line_option:ios_multi_cpus": ios_multi_cpus, + "//command_line_option:macos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "macos", platform_type), + "//command_line_option:tvos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "tvos", platform_type), + "//command_line_option:watchos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "watchos", platform_type), } + ret.update(_apple_platforms_base_values(settings, platform_type)) + return ret -def _apple_rule_base_transition_impl(settings, attr): - """Rule transition for Apple rules using Bazel CPUs and a valid Apple split transition.""" - - # PATCH: start - The following grabs the platform_type and minimum_os_version from the rules_ios attrs. - platform_type = _rules_ios_platform_type(settings, attr) - minimum_os_version = _rules_ios_minimum_os_version(platform_type, attr) - # PATCH: end - - return _command_line_options( - emit_swiftinterface = hasattr(attr, "_emitswiftinterface"), - environment_arch = _environment_archs(platform_type, settings)[0], - minimum_os_version = minimum_os_version, - platform_type = platform_type, - settings = settings, - ) +_supports_visionos = hasattr(apple_common.platform_type, "visionos") # These flags are a mix of options defined in native Bazel from the following fragments: # - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java # - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java # - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java -_apple_rule_common_transition_inputs = [ - build_settings_labels.use_tree_artifacts_outputs, - "//command_line_option:apple_crosstool_top", -] + _CPU_TO_DEFAULT_PLATFORM_FLAG.values() -_apple_rule_base_transition_inputs = _apple_rule_common_transition_inputs + [ - "//command_line_option:apple_platform_type", - "//command_line_option:cpu", - "//command_line_option:ios_multi_cpus", - "//command_line_option:macos_cpus", - "//command_line_option:tvos_cpus", - "//command_line_option:watchos_cpus", -] + (["//command_line_option:visionos_cpus"] if _supports_visionos else []) -_apple_platforms_rule_base_transition_inputs = _apple_rule_base_transition_inputs + [ - "//command_line_option:apple_platforms", - "//command_line_option:incompatible_enable_apple_toolchain_resolution", -] -_apple_platform_transition_inputs = _apple_platforms_rule_base_transition_inputs + [ - "//command_line_option:platforms", -] -_apple_rule_base_transition_outputs = [ - build_settings_labels.use_tree_artifacts_outputs, - "//command_line_option:apple configuration distinguisher", - "//command_line_option:apple_platform_type", - "//command_line_option:apple_platforms", - "//command_line_option:apple_split_cpu", - "//command_line_option:compiler", - "//command_line_option:cpu", - "//command_line_option:crosstool_top", - "//command_line_option:fission", - "//command_line_option:grte_top", - "//command_line_option:ios_minimum_os", - "//command_line_option:macos_minimum_os", - "//command_line_option:minimum_os_version", - "//command_line_option:platforms", - "//command_line_option:tvos_minimum_os", - "//command_line_option:watchos_minimum_os", - "@build_bazel_rules_swift//swift:emit_swiftinterface", -] - -_apple_rule_base_transition = transition( - implementation = _apple_rule_base_transition_impl, - inputs = _apple_rule_base_transition_inputs, - outputs = _apple_rule_base_transition_outputs, +_apple_rule_transition = transition( + implementation = _apple_rule_transition_impl, + inputs = [ + "//command_line_option:apple_crosstool_top", + "//command_line_option:apple_platform_type", + "//command_line_option:cpu", + "//command_line_option:ios_multi_cpus", + "//command_line_option:macos_cpus", + "//command_line_option:tvos_cpus", + "//command_line_option:watchos_cpus", + "//command_line_option:apple_split_cpu", + "//command_line_option:macos_minimum_os", + "//command_line_option:apple_platforms", + ] + ( + ["//command_line_option:visionos_cpus"] if _supports_visionos else [] + ) + _CPU_TO_DEFAULT_PLATFORM_FLAG.values(), + outputs = [ + "//command_line_option:apple configuration distinguisher", + "//command_line_option:apple_platform_type", + "//command_line_option:apple_split_cpu", + "//command_line_option:compiler", + "//command_line_option:cpu", + "//command_line_option:crosstool_top", + "//command_line_option:fission", + "//command_line_option:grte_top", + "//command_line_option:ios_minimum_os", + "//command_line_option:ios_multi_cpus", + "//command_line_option:macos_minimum_os", + "//command_line_option:tvos_minimum_os", + "//command_line_option:watchos_minimum_os", + "//command_line_option:apple_platforms", + "//command_line_option:platforms", + ], ) -def _apple_platform_split_transition_impl(settings, attr): - """Starlark 1:2+ transition for Apple platform-aware rules""" - output_dictionary = {} - invalid_requested_archs = [] - - # PATCH: start - The following grabs the platform_type and minimum_os_version from the rules_ios attrs. - platform_type = _rules_ios_platform_type(settings, attr) - minimum_os_version = _rules_ios_minimum_os_version(platform_type, attr) - # PATCH: end +def _is_arch_supported_for_target_tuple(*, environment_arch, minimum_os_version, platform_type): + """Indicates if the environment_arch selected is supported for the given platform and min os.""" + if minimum_os_version == "": + return True + dotted_minimum_os_version = apple_common.dotted_version(minimum_os_version) + if (environment_arch == "armv7k" and platform_type == "watchos" and + dotted_minimum_os_version >= apple_common.dotted_version("9.0")): + return False + return True - # iOS and tvOS static frameworks require underlying swift_library targets generate a Swift - # interface file. These rules define a private attribute called `_emitswiftinterface` that - # let's this transition flip rules_swift config down the build graph. - emit_swiftinterface = hasattr(attr, "_emitswiftinterface") +def _platform_specific_cpu_setting_name(platform_type): + """Returns the name of a platform-specific CPU setting.""" + flag = _PLATFORM_TYPE_TO_CPUS_FLAG.get(platform_type, None) + if not flag: + fail("ERROR: Unknown platform type: {}".format(platform_type)) + return flag - if settings["//command_line_option:incompatible_enable_apple_toolchain_resolution"]: - platforms = ( - settings["//command_line_option:apple_platforms"] or - settings["//command_line_option:platforms"] - ) - # Currently there is no "default" platform for Apple-based platforms. If necessary, a - # default platform could be generated for the rule's underlying platform_type, but for now - # we work with the assumption that all users of the rules should set an appropriate set of - # platforms when building Apple targets with `apple_platforms`. - - for index, platform in enumerate(platforms): - # Create a new, reordered list so that the platform we need to resolve is always first, - # and the other platforms will follow. - apple_platforms = list(platforms) - platform_to_resolve = apple_platforms.pop(index) - apple_platforms.insert(0, platform_to_resolve) - - if str(platform) not in output_dictionary: - output_dictionary[str(platform)] = _command_line_options( - apple_platforms = apple_platforms, - emit_swiftinterface = emit_swiftinterface, - minimum_os_version = minimum_os_version, +def _environment_archs(platform_type, settings): + """Returns a full set of environment archs from the incoming command line options.""" + environment_archs = settings[_platform_specific_cpu_setting_name(platform_type)] + if not environment_archs: + if platform_type == "ios": + # Legacy exception to interpret the --cpu as an iOS arch. + cpu_value = settings["//command_line_option:cpu"] + if cpu_value.startswith("ios_"): + environment_archs = [cpu_value[4:]] + if not environment_archs: + environment_archs = [ + _cpu_string( + environment_arch = None, platform_type = platform_type, settings = settings, - ) + ).split("_", 1)[1], + ] + return environment_archs - else: - for environment_arch in _environment_archs(platform_type, settings): - found_cpu = _cpu_string( - environment_arch = environment_arch, - platform_type = platform_type, - settings = settings, - ) - if found_cpu in output_dictionary: - continue +def _split_transition_impl(settings, attr): + """Basic split transition for Apple platform-aware rules. - environment_arch_is_supported = _is_arch_supported_for_target_tuple( - environment_arch = environment_arch, - minimum_os_version = minimum_os_version, - platform_type = platform_type, - ) - if not environment_arch_is_supported: - invalid_requested_arch = { - "environment_arch": environment_arch, - "minimum_os_version": minimum_os_version, - "platform_type": platform_type, - } - - # NOTE: This logic to filter unsupported Apple CPUs would be good to implement on - # the platforms side, but it is presently not possible as constraint resolution - # cannot be performed within a transition. - # - # Propagate a warning to the user so that the dropped arch becomes actionable. - # buildifier: disable=print - print( - ("Warning: The architecture {environment_arch} is not valid for " + - "{platform_type} with a minimum OS of {minimum_os_version}. This " + - "architecture will be ignored in this build. This will be an error in a " + - "future version of the Apple rules. Please address this in your build " + - "invocation.").format( - **invalid_requested_arch - ), - ) - invalid_requested_archs.append(invalid_requested_arch) - continue + This has to interop with the other rules and transitions to ensure we have + matching settings.""" + + split_output_dictionary = {} + invalid_requested_archs = [] + emit_swiftinterface = hasattr(attr, "_emitswiftinterface") + platform_type = attr.platform_type + + # Insert platform types based on the CPU + if platform_type == "": + cpu = settings["//command_line_option:cpu"] + if cpu.startswith("ios"): + platform_type = "ios" + elif cpu.startswith("tvos"): + platform_type = "tvos" + elif cpu.startswith("watchos"): + platform_type = "watchos" + elif cpu.startswith("visionos"): + platform_type = "visionos" + else: + platform_type = "macos" + + for environment_arch in _environment_archs(platform_type, settings): + found_cpu = _cpu_string( + environment_arch = environment_arch, + platform_type = platform_type, + settings = settings, + ) + if found_cpu in split_output_dictionary: + continue - output_dictionary[found_cpu] = _command_line_options( - emit_swiftinterface = emit_swiftinterface, - environment_arch = environment_arch, - minimum_os_version = minimum_os_version, + minimum_os_version = attr.minimum_os_version + environment_arch_is_supported = _is_arch_supported_for_target_tuple( + environment_arch = environment_arch, + minimum_os_version = minimum_os_version, + platform_type = platform_type, + ) + if not environment_arch_is_supported: + invalid_requested_arch = { + "environment_arch": environment_arch, + "minimum_os_version": minimum_os_version, + "platform_type": platform_type, + } + invalid_requested_archs.append(invalid_requested_arch) + continue + + cpu_string = _cpu_string(environment_arch, platform_type, settings) + ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"] + attr_platforms = getattr(attr, "platforms", None) + output_dictionary = { + "//command_line_option:apple configuration distinguisher": "applebin_" + platform_type, + "//command_line_option:apple_platform_type": platform_type, + "//command_line_option:apple_split_cpu": environment_arch if (environment_arch and environment_arch != "") else None, + "//command_line_option:compiler": None, + "//command_line_option:cpu": _cpu_string( + environment_arch = None, platform_type = platform_type, settings = settings, - ) - - if not bool(output_dictionary): + ), + "//command_line_option:crosstool_top": ( + settings["//command_line_option:apple_crosstool_top"] + ), + "//command_line_option:fission": [], + "//command_line_option:grte_top": None, + "//command_line_option:ios_minimum_os": _min_os_version_or_none(attr, attr_platforms, "ios", platform_type), + "//command_line_option:ios_multi_cpus": ios_multi_cpus, + "//command_line_option:macos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "macos", platform_type), + "//command_line_option:tvos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "tvos", platform_type), + "//command_line_option:watchos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "watchos", platform_type), + "//command_line_option:minimum_os_version": minimum_os_version, + } + output_dictionary.update(_apple_platforms_base_values(settings, platform_type)) + output_dictionary["@build_bazel_rules_swift//swift:emit_swiftinterface"] = emit_swiftinterface + split_output_dictionary[found_cpu] = output_dictionary + + if not bool(split_output_dictionary): error_msg = "Could not find any valid architectures to build for the current target.\n\n" if invalid_requested_archs: error_msg += "Requested the following invalid architectures:\n" @@ -502,17 +327,44 @@ def _apple_platform_split_transition_impl(settings, attr): "specified minimum_os_version.\n" ) fail(error_msg) - - return output_dictionary - -_apple_platform_split_transition = transition( - implementation = _apple_platform_split_transition_impl, - inputs = _apple_platform_transition_inputs, - outputs = _apple_rule_base_transition_outputs, + return split_output_dictionary + +_split_transition = transition( + implementation = _split_transition_impl, + inputs = [ + "//command_line_option:cpu", + "//command_line_option:apple_crosstool_top", + "//command_line_option:ios_multi_cpus", + "//command_line_option:macos_cpus", + "//command_line_option:tvos_cpus", + "//command_line_option:watchos_cpus", + "//command_line_option:minimum_os_version", + "//command_line_option:apple_platforms", + ] + (["//command_line_option:visionos_cpus"] if _supports_visionos else []) + + _CPU_TO_DEFAULT_PLATFORM_FLAG.values(), + outputs = [ + "//command_line_option:apple configuration distinguisher", + "//command_line_option:apple_platform_type", + "//command_line_option:apple_split_cpu", + "//command_line_option:compiler", + "//command_line_option:cpu", + "//command_line_option:crosstool_top", + "//command_line_option:fission", + "//command_line_option:grte_top", + "//command_line_option:ios_minimum_os", + "//command_line_option:macos_minimum_os", + "//command_line_option:ios_multi_cpus", + "//command_line_option:minimum_os_version", + "//command_line_option:tvos_minimum_os", + "//command_line_option:watchos_minimum_os", + "//command_line_option:apple_platforms", + "//command_line_option:platforms", + "@build_bazel_rules_swift//swift:emit_swiftinterface", + ], ) transition_support = struct( - apple_platform_split_transition = _apple_platform_split_transition, - apple_rule_transition = _apple_rule_base_transition, + apple_rule_transition = _apple_rule_transition, + split_transition = _split_transition, current_apple_platform = _current_apple_platform, ) diff --git a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj index 7815a0d70..2fc4d3b3e 100755 --- a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj @@ -300,7 +300,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -320,9 +320,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -342,7 +342,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -365,7 +365,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -390,7 +390,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -452,9 +452,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -476,7 +476,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -536,7 +536,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -599,9 +599,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -663,7 +663,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -683,7 +683,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -706,9 +706,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj index 883b063f5..71c6d1187 100755 --- a/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj @@ -394,7 +394,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -416,7 +416,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -438,7 +438,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -458,7 +458,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -483,9 +483,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -505,7 +505,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -568,9 +568,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -592,7 +592,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-08527ea01141/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min12.0-applebin_ios-ios_arm64-dbg-ST-ff73fbc70d1a/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj index cd548429d..2f95a4730 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -357,10 +357,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -381,10 +381,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -406,10 +406,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -431,10 +431,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index 834e24e41..aff762815 100755 --- a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -244,7 +244,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj index 3b8260819..72058d55b 100755 --- a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj @@ -401,12 +401,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -464,12 +464,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -490,7 +490,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -512,12 +512,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -538,7 +538,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -560,12 +560,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -621,12 +621,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -644,12 +644,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -666,12 +666,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = "$(inherited)"; @@ -689,12 +689,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index 7d1a56bd8..dd60a884c 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -406,9 +406,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -455,7 +455,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -477,7 +477,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -539,7 +539,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -584,7 +584,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -609,9 +609,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -631,7 +631,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -658,7 +658,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index 5330d6996..b6a417be2 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -375,7 +375,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -492,7 +492,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -552,7 +552,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -572,9 +572,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -594,9 +594,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj index 18f7a1d36..818155db0 100755 --- a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -523,7 +523,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -550,7 +550,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -633,7 +633,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -660,7 +660,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -722,7 +722,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -742,9 +742,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -764,9 +764,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj index 29eb5dee4..ce76bef06 100755 --- a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -517,7 +517,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -564,7 +564,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -651,7 +651,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -700,7 +700,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -724,7 +724,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index 6c5f64452..941b51519 100755 --- a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -244,7 +244,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj index 8db7776ab..56d4c8822 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -423,7 +423,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -446,7 +446,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -469,7 +469,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj index 27cbce1b1..58fcf95e5 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -295,7 +295,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -406,7 +406,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -469,7 +469,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj index 5b1dd8663..bafc08dce 100644 --- a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj @@ -412,10 +412,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -436,7 +436,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -460,10 +460,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -485,10 +485,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-2df07c1252de/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -534,10 +534,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -637,7 +637,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-583c107f4262/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-sim_arm64-min12.0-applebin_ios-ios_sim_arm64-dbg-ST-7916e0de812e/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; From 0b135e874b7fbe1bb2553c211a0c7fa82be8fda8 Mon Sep 17 00:00:00 2001 From: Leonid Melnyk Date: Fri, 5 Apr 2024 13:57:22 +0200 Subject: [PATCH 7/7] PMNG-7009 [platform] Add force load libs to CcInfo linking context in Bazel 7 --- rules/BUILD.bazel | 1 + rules/force_load_direct_deps.bzl | 77 ++++++++++++++++++++------ rules/framework.bzl | 22 ++++++-- rules/internal/framework_middleman.bzl | 57 +++++++++++++++++-- rules/internal/objc_provider_utils.bzl | 7 ++- 5 files changed, 137 insertions(+), 27 deletions(-) diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel index 3d3e1d7b8..4e6906e35 100644 --- a/rules/BUILD.bazel +++ b/rules/BUILD.bazel @@ -53,6 +53,7 @@ bzl_library( ":providers", ":transition_support", "@bazel_skylib//lib:dicts", + "@bazel_skylib//rules:common_settings", ], ) diff --git a/rules/force_load_direct_deps.bzl b/rules/force_load_direct_deps.bzl index 1fd540e16..9baea025f 100644 --- a/rules/force_load_direct_deps.bzl +++ b/rules/force_load_direct_deps.bzl @@ -1,9 +1,9 @@ load("//rules:providers.bzl", "AvoidDepsInfo") load("//rules:transition_support.bzl", "transition_support") -def _impl(ctx): +def _force_load_direct_deps_impl(ctx): if not ctx.attr.should_force_load: - return apple_common.new_objc_provider() + return [apple_common.new_objc_provider(), CcInfo()] force_load = [] @@ -13,24 +13,67 @@ def _impl(ctx): avoid_deps.extend(dep[AvoidDepsInfo].libraries) avoid_libraries = {} - for dep in avoid_deps: - if apple_common.Objc in dep: - for lib in dep[apple_common.Objc].library.to_list(): - avoid_libraries[lib] = True + _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") + if _is_bazel_7: + for dep in avoid_deps: + if CcInfo in dep: + for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list(): + for lib in linker_input.libraries: + avoid_libraries[lib] = True - force_load = [] - for dep in ctx.attr.deps: - if apple_common.Objc in dep: - for lib in dep[apple_common.Objc].library.to_list(): - if not lib in avoid_libraries: - force_load.append(lib) - return apple_common.new_objc_provider( - force_load_library = depset(force_load), - link_inputs = depset(force_load), - ) + force_load = [] + for dep in ctx.attr.deps: + if CcInfo in dep: + for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list(): + for lib in linker_input.libraries: + if not lib in avoid_libraries: + force_load.append(lib) + + static_libraries = [lib.static_library for lib in force_load if lib.static_library != None] + return [ + apple_common.new_objc_provider( + force_load_library = depset(static_libraries), + link_inputs = depset(static_libraries), + ), + CcInfo( + linking_context = cc_common.create_linking_context( + linker_inputs = depset([ + cc_common.create_linker_input( + owner = ctx.label, + libraries = depset([ + cc_common.create_library_to_link( + actions = ctx.actions, + static_library = lib, + alwayslink = True, + ) + for lib in static_libraries + ]), + additional_inputs = depset(static_libraries), + ), + ]), + ), + ), + ] + else: + for dep in avoid_deps: + if apple_common.Objc in dep: + for lib in dep[apple_common.Objc].library.to_list(): + avoid_libraries[lib] = True + force_load = [] + + for dep in ctx.attr.deps: + if apple_common.Objc in dep: + for lib in dep[apple_common.Objc].library.to_list(): + if not lib in avoid_libraries: + force_load.append(lib) + + return apple_common.new_objc_provider( + force_load_library = depset(force_load), + link_inputs = depset(force_load), + ) force_load_direct_deps = rule( - implementation = _impl, + implementation = _force_load_direct_deps_impl, attrs = { "deps": attr.label_list( cfg = transition_support.split_transition, diff --git a/rules/framework.bzl b/rules/framework.bzl index da09884d0..0faf5f057 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -1029,11 +1029,23 @@ def _apple_framework_packaging_impl(ctx): # If not virtualizing the framework - then it runs a "clean" _get_symlinked_framework_clean_action(ctx, framework_files, compilation_context_fields) - cc_info_provider = CcInfo( - compilation_context = cc_common.create_compilation_context( - **compilation_context_fields - ), - ) + _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") + if _is_bazel_7: + cc_info_provider = CcInfo( + compilation_context = cc_common.create_compilation_context( + **compilation_context_fields + ), + linking_context = cc_common.merge_cc_infos( + direct_cc_infos = [], + cc_infos = [dep[CcInfo] for dep in deps], + ).linking_context, + ) + else: + cc_info_provider = CcInfo( + compilation_context = cc_common.create_compilation_context( + **compilation_context_fields + ), + ) if virtualize_frameworks: cc_info = cc_common.merge_cc_infos(direct_cc_infos = [cc_info_provider]) diff --git a/rules/internal/framework_middleman.bzl b/rules/internal/framework_middleman.bzl index 25a683069..87febd0f9 100644 --- a/rules/internal/framework_middleman.bzl +++ b/rules/internal/framework_middleman.bzl @@ -6,6 +6,8 @@ load( "new_applebundleinfo", "new_iosframeworkbundleinfo", ) +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") +load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load( "@build_bazel_rules_apple//apple/internal:partials.bzl", "partials", @@ -31,7 +33,10 @@ load( "//rules/internal:objc_provider_utils.bzl", "objc_provider_utils", ) -load("//rules:transition_support.bzl", "transition_support") +load( + "//rules:transition_support.bzl", + "transition_support", +) def _framework_middleman(ctx): resource_providers = [] @@ -73,12 +78,48 @@ def _framework_middleman(ctx): ]) # Add the frameworks to the linker command - dynamic_framework_provider = objc_provider_utils.merge_dynamic_framework_providers(dynamic_framework_providers) + _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") + dynamic_framework_provider = objc_provider_utils.merge_dynamic_framework_providers( + dynamic_framework_providers, + supports_cc_info_in_dynamic_framework_provider = _is_bazel_7, + ) objc_provider_fields["dynamic_framework_file"] = depset( transitive = [dynamic_framework_provider.framework_files, objc_provider_fields.get("dynamic_framework_file", depset([]))], ) objc_provider = apple_common.new_objc_provider(**objc_provider_fields) + cc_info_provider = cc_common.merge_cc_infos(direct_cc_infos = [], cc_infos = cc_providers) + if _is_bazel_7: + cc_toolchain = find_cpp_toolchain(ctx) + cc_features = cc_common.configure_features( + ctx = ctx, + cc_toolchain = cc_toolchain, + language = "objc", + requested_features = ctx.features, + unsupported_features = ctx.disabled_features, + ) + dynamic_framework_libraries_to_link = [ + cc_common.create_library_to_link( + actions = ctx.actions, + feature_configuration = cc_features, + cc_toolchain = cc_toolchain, + dynamic_library = dynamic_library, + ) + for dynamic_library in objc_provider_fields["dynamic_framework_file"].to_list() + ] + cc_info_provider = cc_common.merge_cc_infos( + direct_cc_infos = [ + CcInfo( + linking_context = cc_common.create_linking_context( + linker_inputs = depset([cc_common.create_linker_input( + owner = ctx.label, + libraries = depset(dynamic_framework_libraries_to_link), + )]), + ), + ), + ] + cc_providers, + ) + providers = [ dynamic_framework_provider, cc_info_provider, @@ -120,6 +161,8 @@ def _framework_middleman(ctx): framework_middleman = rule( implementation = _framework_middleman, + fragments = ["cpp"], + toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], attrs = { "framework_deps": attr.label_list( cfg = transition_support.split_transition, @@ -154,7 +197,8 @@ framework_middleman = rule( ), "_allowlist_function_transition": attr.label( default = "@bazel_tools//tools/allowlists/function_transition_allowlist", - doc = "Needed to allow this rule to have an incoming edge configuration transition.", + doc = """Needed to allow this rule to have an incoming edge configuration transition. +""", ), }, doc = """ @@ -191,9 +235,13 @@ def _dep_middleman(ctx): cc_providers = [] avoid_libraries = {} + _is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition") + def _collect_providers(lib_dep): if apple_common.Objc in lib_dep: objc_providers.append(lib_dep[apple_common.Objc]) + if _is_bazel_7 and CcInfo in lib_dep: + cc_providers.append(lib_dep[CcInfo]) def _process_avoid_deps(avoid_dep_libs): for dep in avoid_dep_libs: @@ -280,7 +328,8 @@ dep_middleman = rule( ), "_allowlist_function_transition": attr.label( default = "@bazel_tools//tools/allowlists/function_transition_allowlist", - doc = "Needed to allow this rule to have an incoming edge configuration transition.", + doc = """Needed to allow this rule to have an incoming edge configuration transition. +""", ), }, doc = """ diff --git a/rules/internal/objc_provider_utils.bzl b/rules/internal/objc_provider_utils.bzl index cba49ae47..de9a6793e 100644 --- a/rules/internal/objc_provider_utils.bzl +++ b/rules/internal/objc_provider_utils.bzl @@ -37,7 +37,7 @@ def _merge_objc_providers(providers, transitive = []): ) return apple_common.new_objc_provider(**objc_provider_fields) -def _merge_dynamic_framework_providers(dynamic_framework_providers): +def _merge_dynamic_framework_providers(dynamic_framework_providers, supports_cc_info_in_dynamic_framework_provider): fields = {} merge_keys = [ "framework_dirs", @@ -53,6 +53,11 @@ def _merge_dynamic_framework_providers(dynamic_framework_providers): fields["objc"] = apple_common.new_objc_provider() + if not supports_cc_info_in_dynamic_framework_provider: + fields.pop("cc_info", None) + elif "cc_info" not in fields: + fields["cc_info"] = CcInfo() + return apple_common.new_dynamic_framework_provider(**fields) objc_provider_utils = struct(