jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OpenSSL pod and remove exclude arch setting (#1892)

Browse Source 
Summary:
This PR updates the OpenSSL pod and thus updates the corresponding Folly and RSocket pods. The new OpenSSL pod has a support of arm64 artifact for iPhomeSimulators.This PR also updates the replaces the libevent pod which didn't work with arm64 arch for iPhoneSimulator.

## Changelog

- Update OpenSSL pod
- Update Folly dep
- Update RSocket dep
- Replace Libevent pod.

Pull Request resolved: https://github.com/facebook/flipper/pull/1892

Test Plan: CI

Reviewed By: mweststrate

Differential Revision: D26229304

Pulled By: priteshrnandgaonkar

fbshipit-source-id: 46256d9cd3e0cf5aab6e477e612c3bcb77e31627
This commit is contained in:
Pritesh Nandgaonkar
2021-02-04 08:47:47 -08:00
committed by Facebook GitHub Bot
parent 87caca9e77
commit 0ebe3956a4
13 changed files with 681 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
View File

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {
/* Begin PBXBuildFile section */
@@ -108,6 +108,7 @@
A1EC522520DED61B007C6977 /* Sources */,
A1EC522620DED61B007C6977 /* Frameworks */,
A1EC522720DED61B007C6977 /* Resources */,
81A476F618E0C49909B529C9 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -165,6 +166,23 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
81A476F618E0C49909B529C9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SampleSwift/Pods-SampleSwift-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D9A91DD7C5294D8508D0A168 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -339,16 +357,29 @@
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/ComponentKit\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-DoubleConversion\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-Folly\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-Glog\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-PeerTalk\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Flipper-RSocket\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/FlipperKit\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/RenderCore\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/YogaKit\"",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"crypto\"",
"-l\"event\"",
"-l\"event_core\"",
"-l\"event_extra\"",
"-l\"event_pthreads\"",
"-l\"ssl\"",
"-l\"stdc++\"",
"-framework",
"\"CFNetwork\"",
@@ -380,12 +411,10 @@
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"crypto\"",
"-l\"event\"",
"-l\"event_core\"",
"-l\"event_extra\"",
"-l\"event_pthreads\"",
"-l\"ssl\"",
"-l\"stdc++\"",
"-framework",
"\"CFNetwork\"",