[Apple] Fix Remove copy standard swift libraries step phase from AppC…

…lips bundle. (#2564) * Remove copy standard swift libraries step phase from AppClips bundle * Remove unnecessary new line * Commit to run tests again (flaky test failed) Co-authored-by: Lucas Marçal <[email protected]>
facebook · Dec 16, 2020 · 2dfc734 · 2dfc734
1 parent 3ba8a81
commit 2dfc734
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/com/facebook/buck/apple/AppleBundle.java b/src/com/facebook/buck/apple/AppleBundle.java
@@ -612,7 +612,8 @@ public ImmutableList<Step> getBuildSteps(
           sdkPath,
           lipo,
           bundleBinaryPath,
-          destinations);
+          destinations,
+          isAppClip.orElse(false));
 
       for (BuildRule extraBinary : extraBinaries) {
         Path outputPath = getBundleBinaryPathForBuildRule(extraBinary);
@@ -667,7 +668,8 @@ public ImmutableList<Step> getBuildSteps(
           sdkPath,
           lipo,
           bundleBinaryPath,
-          destinations);
+          destinations,
+          isAppClip.orElse(false));
     }
 
     // Ensure the bundle directory is archived so we can fetch it later.
@@ -812,7 +814,8 @@ public void addSwiftStdlibStepIfNeeded(
         sdkPath,
         lipo,
         bundleBinaryPath,
-        destinations);
+        destinations,
+        isAppClip.orElse(false));
   }
 
   private void copyAnotherCopyOfWatchKitStub(

diff --git a/src/com/facebook/buck/apple/AppleResourceProcessing.java b/src/com/facebook/buck/apple/AppleResourceProcessing.java
@@ -222,12 +222,14 @@ public static void addSwiftStdlibStepIfNeeded(
       Path sdkPath,
       Tool lipo,
       Path bundleBinaryPath,
-      AppleBundleDestinations destinations) {
+      AppleBundleDestinations destinations,
+      boolean isAppClip) {
     // It's apparently safe to run this even on a non-swift bundle (in that case, no libs
     // are copied over).
     boolean shouldCopySwiftStdlib =
         !bundleExtension.equals(AppleBundleExtension.APPEX.toFileExtension())
             && (!bundleExtension.equals(AppleBundleExtension.FRAMEWORK.toFileExtension())
+            && !isAppClip
                 || copySwiftStdlibToFrameworks);
 
     if (swiftStdlibTool.isPresent() && shouldCopySwiftStdlib) {

diff --git a/test/com/facebook/buck/apple/AppleBundleIntegrationTest.java b/test/com/facebook/buck/apple/AppleBundleIntegrationTest.java
@@ -1185,8 +1185,10 @@ public void appClipApplicationBundle() throws IOException {
     assertTrue(Files.exists(appPath.resolve("Info.plist")));
 
     Path appClipPath = appPath.resolve("AppClips/Clip.app/");
+
     assertTrue(Files.exists(appClipPath.resolve("Clip")));
     assertTrue(Files.exists(appClipPath.resolve("Info.plist")));
+    assertFalse(Files.exists(appClipPath.resolve("Frameworks")));
   }
 
   @Test