Add support to Swift Concurrency backport using swift-stdlib-tool (#69)

* Add swift config  swift_stdlib_tool_run_on_subfolders to prevent to import libraries needed for 3rd party libs that supports iOS below 12
Add swift config swift_stdlib_tool_import_only_concurrency_lib to import only libswift_concurrency* libraries

* change from boolean type to Optional<Boolean> to match initializers

Co-authored-by: Lucas Marcal <[email protected]>

src/com/facebook/buck/apple/AppleBinaryDescription.java

@@ -128,24 +128,24 @@ public AppleBinaryDescription(
       SwiftLibraryDescription swiftDelegate,
       AppleConfig appleConfig,
       CxxBuckConfig cxxBuckConfig,
-      SwiftBuckConfig swiftBuckConfig,
       DownwardApiConfig downwardApiConfig,
       CxxBinaryImplicitFlavors cxxBinaryImplicitFlavors,
       CxxBinaryFactory cxxBinaryFactory,
       CxxBinaryMetadataFactory cxxBinaryMetadataFactory,
-      CxxBinaryFlavored cxxBinaryFlavored) {
+      CxxBinaryFlavored cxxBinaryFlavored,
+      SwiftBuckConfig swiftBuckConfig) {
     this.toolchainProvider = toolchainProvider;
     this.xcodeDescriptions = xcodeDescriptions;
     // TODO(T22135033): Make apple_binary not use a Swift delegate
     this.swiftDelegate = Optional.of(swiftDelegate);
     this.appleConfig = appleConfig;
     this.cxxBuckConfig = cxxBuckConfig;
-    this.swiftBuckConfig = swiftBuckConfig;
     this.downwardApiConfig = downwardApiConfig;
     this.cxxBinaryImplicitFlavors = cxxBinaryImplicitFlavors;
     this.cxxBinaryFactory = cxxBinaryFactory;
     this.cxxBinaryMetadataFactory = cxxBinaryMetadataFactory;
     this.cxxBinaryFlavored = cxxBinaryFlavored;
+    this.swiftBuckConfig = swiftBuckConfig;
   }
 
   @Override
@@ -422,13 +422,10 @@ private BuildRule createBundleBuildRule(
         Optional.empty(),
         Optional.empty(),
         appleConfig.getCodesignTimeout(),
-        swiftBuckConfig.getCopyStdlibToFrameworks(),
-        swiftBuckConfig.getStdlibToolEnabled(),
+        Optional.empty(),
         cxxBuckConfig.shouldCacheStrip(),
         appleConfig.useEntitlementsWhenAdhocCodeSigning(),
         Predicates.alwaysTrue(),
-        swiftBuckConfig.getSliceAppPackageSwiftRuntime(),
-        swiftBuckConfig.getSliceAppBundleSwiftRuntime(),
         downwardApiConfig.isEnabledForApple(),
         args.getTargetSdkVersion(),
         appleConfig.getIncrementalBundlingEnabled(),
@@ -437,7 +434,9 @@ private BuildRule createBundleBuildRule(
         appleConfig.getIncrementalHashCacheEnabled(),
         false,
         false,
-        Optional.empty());
+        Optional.empty(),
+        swiftBuckConfig.getSwiftStdlibToolRunOnSubfolders(),
+        swiftBuckConfig.getSwiftStdlibToolConcurrencyLibsOnly());
   }
 
   private BuildRule createBinary(

src/com/facebook/buck/apple/AppleBundle.java

@@ -136,18 +136,11 @@ public class AppleBundle extends AbstractBuildRule
 
   @AddToRuleKey private final Optional<Tool> swiftStdlibTool;
 
-  @AddToRuleKey private final Tool lipo;
-
+  @AddToRuleKey private final Optional<Tool> bitcodeStripTool;
   @AddToRuleKey private final ImmutableList<String> codesignFlags;
 
   @AddToRuleKey private final Optional<String> codesignIdentitySubjectName;
 
-  @AddToRuleKey private final boolean copySwiftStdlibToFrameworks;
-  @AddToRuleKey private final boolean swiftStdlibToolEnabled;
-
-  @AddToRuleKey private final boolean sliceAppPackageSwiftRuntime;
-  @AddToRuleKey private final boolean sliceAppBundleSwiftRuntime;
-
   private final Path sdkPath;
 
   private final BuildRule binary;
@@ -182,6 +175,12 @@ public class AppleBundle extends AbstractBuildRule
 
   @AddToRuleKey private final boolean inputBasedRulekeyEnabled;
 
+  @AddToRuleKey private final Optional<Boolean> skipCopyingSwiftStdlib;
+
+  private final boolean swiftStdlibRunOnSubfolders;
+
+  private final boolean swiftStdlibConcurrencyLibsOnly;
+
   AppleBundle(
       BuildTarget buildTarget,
       ProjectFilesystem projectFilesystem,
@@ -204,10 +203,7 @@ public class AppleBundle extends AbstractBuildRule
       ImmutableList<String> codesignFlags,
       Optional<String> codesignIdentity,
       Duration codesignTimeout,
-      boolean copySwiftStdlibToFrameworks,
-      boolean swiftStdlibToolEnabled,
-      boolean sliceAppPackageSwiftRuntime,
-      boolean sliceAppBundleSwiftRuntime,
+      Optional<Boolean> skipCopyingSwiftStdlib,
       boolean withDownwardApi,
       Optional<SourcePath> maybeEntitlementsFile,
       boolean dryRunCodeSigning,
@@ -216,7 +212,9 @@ public class AppleBundle extends AbstractBuildRule
       Optional<SourcePath> nonProcessedResourcesContentHashesFileSourcePath,
       Optional<SourcePath> processedResourcesContentHashesFileSourcePath,
       boolean incrementalBundlingEnabled,
-      boolean inputBasedRulekeyEnabled) {
+      boolean inputBasedRulekeyEnabled,
+      boolean swiftStdlibRunOnSubfolders,
+      boolean swiftStdlibConcurrencyLibsOnly) {
     super(buildTarget, projectFilesystem);
     this.buildRuleParams = params;
     this.extension = extension;
@@ -262,22 +260,22 @@ public class AppleBundle extends AbstractBuildRule
         appleCxxPlatform.getSwiftPlatform().isPresent()
             ? appleCxxPlatform.getSwiftPlatform().get().getSwiftStdlibTool()
             : Optional.empty();
-    this.lipo = appleCxxPlatform.getLipo();
+    this.bitcodeStripTool = appleCxxPlatform.getBitcodeStripTool();
 
+    this.skipCopyingSwiftStdlib = skipCopyingSwiftStdlib;
     this.codesignTimeout = codesignTimeout;
-    this.copySwiftStdlibToFrameworks = copySwiftStdlibToFrameworks;
-    this.swiftStdlibToolEnabled = swiftStdlibToolEnabled;
     this.depsSupplier = BuildableSupport.buildDepsSupplier(this, graphBuilder);
 
-    this.sliceAppPackageSwiftRuntime = sliceAppPackageSwiftRuntime;
-    this.sliceAppBundleSwiftRuntime = sliceAppBundleSwiftRuntime;
     this.infoPlistBundlePath = bundleRoot.resolve(infoPlistPathRelativeToBundle.getPath());
     this.nonProcessedResourcesContentHashesFileSourcePath =
         nonProcessedResourcesContentHashesFileSourcePath;
     this.processedResourcesContentHashesFileSourcePath =
         processedResourcesContentHashesFileSourcePath;
     this.incrementalBundlingEnabled = incrementalBundlingEnabled;
     this.inputBasedRulekeyEnabled = inputBasedRulekeyEnabled;
+
+    this.swiftStdlibRunOnSubfolders = swiftStdlibRunOnSubfolders;
+    this.swiftStdlibConcurrencyLibsOnly = swiftStdlibConcurrencyLibsOnly;
   }
 
   public static String getBinaryName(BuildTarget buildTarget, Optional<String> productName) {
@@ -1086,10 +1084,9 @@ public void addSwiftStdlibStepIfNeeded(
       boolean isForPackaging) {
     // It's apparently safe to run this even on a non-swift bundle (in that case, no libs
     // are copied over).
-    boolean shouldCopySwiftStdlib = swiftStdlibToolEnabled &&
-        (!extension.equals(AppleBundleExtension.APPEX.fileExtension) &&
-            (!extension.equals(AppleBundleExtension.FRAMEWORK.fileExtension) ||
-                copySwiftStdlibToFrameworks));
+    boolean shouldCopySwiftStdlib = !skipCopyingSwiftStdlib.orElse(false)
+        && !extension.equals(AppleBundleExtension.APPEX.fileExtension)
+        && !extension.equals(AppleBundleExtension.FRAMEWORK.fileExtension);
 
     if (swiftStdlibTool.isPresent() && shouldCopySwiftStdlib) {
       String tempDirPattern = isForPackaging ? "__swift_packaging_temp__%s" : "__swift_temp__%s";
@@ -1098,23 +1095,27 @@ public void addSwiftStdlibStepIfNeeded(
 
       stepsBuilder.addAll(MakeCleanDirectoryStep.of(BuildCellRelativePath.of(tempPath)));
 
-      boolean sliceArchitectures =
-          (isForPackaging ? sliceAppPackageSwiftRuntime : sliceAppBundleSwiftRuntime);
+      ImmutableSet<Path> subfolderPaths = ImmutableSet.of();
+
+      if (swiftStdlibRunOnSubfolders) {
+        subfolderPaths = ImmutableSet.of(
+            bundleRoot.resolve(destinations.getFrameworksPath()),
+            bundleRoot.resolve(destinations.getPlugInsPath()));
+      }
+
       stepsBuilder.add(
           new SwiftStdlibStep(
               getProjectFilesystem().getRootPath(),
               tempPath.getPath(),
               sdkPath,
               destinationPath,
               swiftStdlibTool.get().getCommandPrefix(resolver),
-              lipo.getCommandPrefix(resolver),
               bundleBinaryPath,
-              ImmutableSet.of(
-                  bundleRoot.resolve(destinations.getFrameworksPath()),
-                  bundleRoot.resolve(destinations.getPlugInsPath())),
+              subfolderPaths,
               codeSignIdentitySupplier,
-              sliceArchitectures,
-              withDownwardApi));
+              withDownwardApi,
+              bitcodeStripTool.get().getCommandPrefix(resolver),
+              swiftStdlibConcurrencyLibsOnly));
     }
   }
 

src/com/facebook/buck/apple/AppleBundleDescription.java

@@ -102,16 +102,16 @@ public AppleBundleDescription(
       AppleLibraryDescription appleLibraryDescription,
       AppleConfig appleConfig,
       CxxBuckConfig cxxBuckConfig,
-      SwiftBuckConfig swiftBuckConfig,
-      DownwardApiConfig downwardApiConfig) {
+      DownwardApiConfig downwardApiConfig,
+      SwiftBuckConfig swiftBuckConfig) {
     this.toolchainProvider = toolchainProvider;
     this.xcodeDescriptions = xcodeDescriptions;
     this.appleBinaryDescription = appleBinaryDescription;
     this.appleLibraryDescription = appleLibraryDescription;
     this.appleConfig = appleConfig;
     this.cxxBuckConfig = cxxBuckConfig;
-    this.swiftBuckConfig = swiftBuckConfig;
     this.downwardApiConfig = downwardApiConfig;
+    this.swiftBuckConfig = swiftBuckConfig;
   }
 
   @Override
@@ -232,13 +232,10 @@ public AppleBundle createBuildRule(
         args.getIbtoolModuleFlag(),
         args.getIbtoolFlags(),
         appleConfig.getCodesignTimeout(),
-        swiftBuckConfig.getCopyStdlibToFrameworks(),
-        swiftBuckConfig.getStdlibToolEnabled(),
+        args.getSkipCopyingSwiftStdlib(),
         cxxBuckConfig.shouldCacheStrip(),
         appleConfig.useEntitlementsWhenAdhocCodeSigning(),
         resourceFilter,
-        swiftBuckConfig.getSliceAppPackageSwiftRuntime(),
-        swiftBuckConfig.getSliceAppBundleSwiftRuntime(),
         downwardApiConfig.isEnabledForApple(),
         minOSVersion,
         appleConfig.getIncrementalBundlingEnabled(),
@@ -247,7 +244,9 @@ public AppleBundle createBuildRule(
         appleConfig.getIncrementalHashCacheEnabled(),
         false,
         false,
-        Optional.empty());
+        Optional.empty(),
+        swiftBuckConfig.getSwiftStdlibToolRunOnSubfolders(),
+        swiftBuckConfig.getSwiftStdlibToolConcurrencyLibsOnly());
   }
 
   private static Optional<String> getMinimumOSVersionForBundle(

src/com/facebook/buck/apple/AppleDescriptionProvider.java

@@ -96,12 +96,12 @@ public Collection<Description<?>> getDescriptions(DescriptionCreationContext con
             swiftLibraryDescription,
             appleConfig,
             cxxBuckConfig,
-            swiftBuckConfig,
             downwardApiConfig,
             cxxBinaryImplicitFlavors,
             cxxBinaryFactory,
             cxxBinaryMetadataFactory,
-            cxxBinaryFlavored);
+            cxxBinaryFlavored,
+            swiftBuckConfig);
 
     return Arrays.asList(
         new AppleAssetCatalogDescription(),
@@ -124,8 +124,8 @@ public Collection<Description<?>> getDescriptions(DescriptionCreationContext con
             appleLibraryDescription,
             appleConfig,
             cxxBuckConfig,
-            swiftBuckConfig,
-            downwardApiConfig),
+            downwardApiConfig,
+            swiftBuckConfig),
         new AppleTestDescription(
             toolchainProvider,
             xcodeDescriptions,

src/com/facebook/buck/apple/AppleDescriptions.java

@@ -792,13 +792,10 @@ static AppleBundle createAppleBundle(
       Optional<Boolean> ibtoolModuleFlag,
       Optional<ImmutableList<String>> ibtoolFlags,
       Duration codesignTimeout,
-      boolean copySwiftStdlibToFrameworks,
-      boolean swiftStdlibToolEnabled,
+      Optional<Boolean> skipCopyingSwiftStdlib,
       boolean cacheStrips,
       boolean useEntitlementsWhenAdhocCodeSigning,
       Predicate<BuildTarget> filter,
-      boolean sliceAppPackageSwiftRuntime,
-      boolean sliceAppBundleSwiftRuntime,
       boolean withDownwardApi,
       Optional<String> minimumOSVersion,
       boolean incrementalBundlingEnabled,
@@ -807,7 +804,9 @@ static AppleBundle createAppleBundle(
       boolean shouldCacheFileHashes,
       boolean shouldEmbedXctest,
       boolean doNotEmbedHostAppInTestBundle,
-      Optional<AppleTestDescription.TestHostInfo> testHostInfo) {
+      Optional<AppleTestDescription.TestHostInfo> testHostInfo,
+      boolean swiftStdlibRunOnSubfolders,
+      boolean swiftStdlibConcurrencyLibsOnly) {
     AppleCxxPlatform appleCxxPlatform =
         ApplePlatforms.getAppleCxxPlatformForBuildTarget(
             graphBuilder,
@@ -1412,10 +1411,7 @@ static AppleBundle createAppleBundle(
         codesignFlags,
         codesignAdhocIdentity,
         codesignTimeout,
-        copySwiftStdlibToFrameworks,
-        swiftStdlibToolEnabled,
-        sliceAppPackageSwiftRuntime,
-        sliceAppBundleSwiftRuntime,
+        skipCopyingSwiftStdlib,
         withDownwardApi,
         entitlementsReadyForCodeSign,
         dryRunCodeSigning,
@@ -1424,7 +1420,9 @@ static AppleBundle createAppleBundle(
         nonProcessedResourcesContentHashesFileSourcePath,
         processResources.getSourcePathToContentHashes(),
         incrementalBundlingEnabled,
-        bundleInputBasedRulekeyEnabled);
+        bundleInputBasedRulekeyEnabled,
+        swiftStdlibRunOnSubfolders,
+        swiftStdlibConcurrencyLibsOnly);
   }
 
   private static Optional<SourcePath> entitlementsSourcePath(

src/com/facebook/buck/apple/AppleLibraryDescription.java

@@ -545,13 +545,10 @@ private <A extends AbstractAppleLibraryDescriptionArg> BuildRule createFramework
         Optional.empty(),
         Optional.empty(),
         appleConfig.getCodesignTimeout(),
-        swiftBuckConfig.getCopyStdlibToFrameworks(),
-        swiftBuckConfig.getStdlibToolEnabled(),
+        Optional.empty(),
         cxxBuckConfig.shouldCacheStrip(),
         appleConfig.useEntitlementsWhenAdhocCodeSigning(),
         Predicates.alwaysTrue(),
-        swiftBuckConfig.getSliceAppPackageSwiftRuntime(),
-        swiftBuckConfig.getSliceAppBundleSwiftRuntime(),
         downwardApiConfig.isEnabledForApple(),
         args.getTargetSdkVersion(),
         appleConfig.getIncrementalBundlingEnabled(),
@@ -560,7 +557,9 @@ private <A extends AbstractAppleLibraryDescriptionArg> BuildRule createFramework
         appleConfig.getIncrementalHashCacheEnabled(),
         false,
         false,
-        Optional.empty());
+        Optional.empty(),
+        swiftBuckConfig.getSwiftStdlibToolRunOnSubfolders(),
+        swiftBuckConfig.getSwiftStdlibToolConcurrencyLibsOnly());
   }
 
   /**

src/com/facebook/buck/apple/AppleTestDescription.java

@@ -397,13 +397,10 @@ public BuildRule createBuildRule(
                         Optional.empty(),
                         Optional.empty(),
                         appleConfig.getCodesignTimeout(),
-                        swiftBuckConfig.getCopyStdlibToFrameworks(),
-                        swiftBuckConfig.getStdlibToolEnabled(),
+                        args.getSkipCopyingSwiftStdlib(),
                         cxxBuckConfig.shouldCacheStrip(),
                         appleConfig.useEntitlementsWhenAdhocCodeSigning(),
                         Predicates.alwaysTrue(),
-                        swiftBuckConfig.getSliceAppPackageSwiftRuntime(),
-                        swiftBuckConfig.getSliceAppBundleSwiftRuntime(),
                         downwardApiConfig.isEnabledForApple(),
                         args.getTargetSdkVersion(),
                         appleConfig.getIncrementalBundlingEnabled(),
@@ -412,7 +409,9 @@ public BuildRule createBuildRule(
                         appleConfig.getIncrementalHashCacheEnabled(),
                         appleConfig.getEmbedXctestInTestBundles(),
                         appleConfig.getDoNotEmbedHostAppInTestBundle(),
-                        testHostWithTargetApp));
+                        testHostWithTargetApp,
+                        swiftBuckConfig.getSwiftStdlibToolRunOnSubfolders(),
+                        swiftBuckConfig.getSwiftStdlibToolConcurrencyLibsOnly()));
 
     Optional<SourcePath> xctool =
         getXctool(projectFilesystem, params, targetConfiguration, graphBuilder);

src/com/facebook/buck/apple/AppleToolchainDescription.java

@@ -174,6 +174,8 @@ public BuildRule createBuildRule(
             .setAppleSdkPaths(sdkPaths)
             .setAppleSdk(sdk)
             .setWatchKitStubBinary(args.getWatchKitStubBinary())
+            .setBitcodeStripTool(args.getBitcodeStripTool()
+                .map(path -> Tools.resolveTool(path, actionGraphBuilder)))
             .build();
 
     return new AppleToolchainBuildRule(
@@ -311,5 +313,6 @@ interface AbstractAppleToolchainDescriptionArg extends BuildRuleArg {
 
     /** WatchKit stub binary (WK) */
     Optional<SourcePath> getWatchKitStubBinary();
+    Optional<SourcePath> getBitcodeStripTool();
   }
 }

src/com/facebook/buck/apple/HasAppleBundleFields.java

@@ -33,6 +33,8 @@ public interface HasAppleBundleFields {
 
   ImmutableMap<String, String> getInfoPlistSubstitutions();
 
+  Optional<Boolean> getSkipCopyingSwiftStdlib();
+
   @Value.Default
   default AppleAssetCatalogsCompilationOptions getAssetCatalogsCompilationOptions() {
     return AppleAssetCatalogsCompilationOptions.builder().build();