Skip to content

Commit

Permalink
Unreviewed, reverting 274425@main.
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=269151

Introduced perf testing issue

Reverted changeset:

"Change install location of WebKit process extensions"
https://bugs.webkit.org/show_bug.cgi?id=268946
https://commits.webkit.org/274425@main

Canonical link: https://commits.webkit.org/274431@main
  • Loading branch information
@webkit-commit-queue @pvollan
webkit-commit-queue authored and pvollan committed Feb 11, 2024
1 parent 55e6e14 commit f7780c8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 82 deletions.
7 changes: 1 addition & 6 deletions Source/WebKit/Configurations/BaseExtension.xcconfig
View file
Expand Up @@ -26,7 +26,7 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_INSTRUMENT_FOR_OPTIMIZATION_PROFILING = NO;
INSTALL_PATH = $(INSTALL_PATH_PREFIX)/System/Library/ExtensionKit/Extensions;
INSTALL_PATH = $(WK_INSTALL_PATH_PREFIX)/System/Library/ExtensionKit/Extensions;
SWIFT_OBJC_BRIDGING_HEADER = $(SWIFT_OBJC_BRIDGING_HEADER_$(USE_INTERNAL_SDK));
SWIFT_OBJC_BRIDGING_HEADER_ = ;
SWIFT_OBJC_BRIDGING_HEADER_YES = ;
Expand Down Expand Up @@ -65,8 +65,3 @@ WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS = --entitlements $(WK_PROCESSED_XCENT_FILE

OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
OTHER_CODE_SIGN_FLAGS[sdk=*simulator] = ;

ALTERNATE_ROOT_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/ExtensionKit/Extensions

OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_NOT_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)));
OUTPUT_ALTERNATE_ROOT_PATH_YES_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
76 changes: 0 additions & 76 deletions Source/WebKit/WebKit.xcodeproj/project.pbxproj
View file
Expand Up @@ -17332,7 +17332,6 @@
5C139DA529DB82E500D5117B /* Frameworks */,
5C139DA729DB82E500D5117B /* Resources */,
E352B5512AB2612B006F6B0D /* Process entitlements */,
E311D2AD2B770E020074BC7E /* Create symlink */,
);
buildRules = (
);
Expand Down Expand Up @@ -17373,7 +17372,6 @@
5CA5A2C729CBBA1A000F1046 /* Frameworks */,
5CA5A2C829CBBA1A000F1046 /* Resources */,
E352B54F2AB25EA8006F6B0D /* Process entitlements */,
E311D2AB2B770DDD0074BC7E /* Create symlink */,
);
buildRules = (
);
Expand Down Expand Up @@ -17414,7 +17412,6 @@
5CE4B60C29CF87680038F565 /* Frameworks */,
5CE4B60E29CF87680038F565 /* Resources */,
E352B5522AB2663F006F6B0D /* Process entitlements */,
E311D2A92B76DCCA0074BC7E /* Create symlink */,
);
buildRules = (
);
Expand All @@ -17434,7 +17431,6 @@
5CE4B61929CF877F0038F565 /* Frameworks */,
5CE4B61B29CF877F0038F565 /* Resources */,
E352B5532AB2669A006F6B0D /* Process entitlements */,
E311D2AA2B770DB80074BC7E /* Create symlink */,
);
buildRules = (
);
Expand Down Expand Up @@ -18617,78 +18613,6 @@
shellPath = /bin/sh;
shellScript = "echo \"Preprocessing sandbox\"\nScripts/generate-derived-sources.sh sandbox-profiles-ios\nmkdir -p ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.adattributiond.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.webpushd.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.GPU.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.Networking.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebAuthn.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebContent.sb ${DSTROOT}/${INSTALL_PATH}\n";
};
E311D2A92B76DCCA0074BC7E /* Create symlink */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Create symlink";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
E311D2AA2B770DB80074BC7E /* Create symlink */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Create symlink";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
E311D2AB2B770DDD0074BC7E /* Create symlink */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Create symlink";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
E311D2AD2B770E020074BC7E /* Create symlink */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Create symlink";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
E352B54F2AB25EA8006F6B0D /* Process entitlements */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down

0 comments on commit f7780c8

Please sign in to comment.