Commit 9b3a5c8e authored by justincohen's avatar justincohen Committed by Commit bot

Set framework -install_name to rpath for EarlGrey and OCHamcrest.

For binary completeness with Xcode builds. This is also useful for running
TEST_HOST binaries outside of an xctest framework.

BUG=

Review-Url: https://codereview.chromium.org/1914253002
Cr-Commit-Position: refs/heads/master@{#390362}
parent 956f91b7
...@@ -272,6 +272,11 @@ ...@@ -272,6 +272,11 @@
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
'BUNDLE_IDENTIFIER': 'com.google.earlgrey.EarlGrey', 'BUNDLE_IDENTIFIER': 'com.google.earlgrey.EarlGrey',
'INFOPLIST_FILE': 'src/EarlGrey-Info.plist', 'INFOPLIST_FILE': 'src/EarlGrey-Info.plist',
'DYLIB_INSTALL_NAME_BASE': '@rpath',
'OTHER_LDFLAGS': [
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks'
]
}, },
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
......
...@@ -230,6 +230,11 @@ ...@@ -230,6 +230,11 @@
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
'PRODUCT_BUNDLE_IDENTIFIER': 'org.hamcrest.OCHamcrest.OCHamcrest-iOS', 'PRODUCT_BUNDLE_IDENTIFIER': 'org.hamcrest.OCHamcrest.OCHamcrest-iOS',
'INFOPLIST_FILE': 'src/Source/OCHamcrest-Info.plist', 'INFOPLIST_FILE': 'src/Source/OCHamcrest-Info.plist',
'DYLIB_INSTALL_NAME_BASE': '@rpath',
'OTHER_LDFLAGS': [
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks'
]
}, },
'include_dirs': [ 'include_dirs': [
'src', 'src',
......
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
}, },
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'shell/test/Host-Info.plist', 'INFOPLIST_FILE': 'shell/test/Host-Info.plist',
'OTHER_LDFLAGS': [
'-Xlinker', '-rpath', '-Xlinker', '@executable_path/Frameworks',
'-Xlinker', '-rpath', '-Xlinker', '@loader_path/Frameworks'
]
}, },
'dependencies': [ 'dependencies': [
'ios_web_shell_test_support', 'ios_web_shell_test_support',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment