diff options
| author | maniscalco <maniscalco@chromium.org> | 2015-04-16 11:57:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-16 18:57:33 +0000 |
| commit | fe4be3daa9f58e38bfc44ef8c692eb59b4db0b29 (patch) | |
| tree | 7ce7851172c69b263fa455af88e34a196fa0716d /sync | |
| parent | b88873e437fd81320bc7149908eee71561726a4a (diff) | |
| download | chromium_src-fe4be3daa9f58e38bfc44ef8c692eb59b4db0b29.zip chromium_src-fe4be3daa9f58e38bfc44ef8c692eb59b4db0b29.tar.gz chromium_src-fe4be3daa9f58e38bfc44ef8c692eb59b4db0b29.tar.bz2 | |
Revert of Fix errors found in Mac gn component builds (patchset #10 id:180001 of https://codereview.chromium.org/1087873003/)
Reason for revert:
Suspected of breaking Mac GN, see https://codereview.chromium.org/1087873003
Original issue's description:
> Fix errors found in Mac gn component builds
>
> Mac gn component build fail because of missing frameworks and missing some other
> dependencies, and occasionally file list out of sync with the gyp counterpart:
> http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_dbg/builds/321/steps/compile/logs/stdio
>
> For instance, the frameworks linked in the components that sync depends on is not
> automatically linked into sync, thus revealing the issue.
>
> Committed: https://crrev.com/ae8297db22a6ca96652d42bd0cdc3deff17aba4a
> Cr-Commit-Position: refs/heads/master@{#325479}
TBR=dpranke@google.com,dpranke@chromium.org,brettw@chromium.org,avi@chromium.org,toyoshim@chromium.org,piman@chromium.org,pavely@chromium.org,dalecurtis@chromium.org,jiangj@opera.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1089773003
Cr-Commit-Position: refs/heads/master@{#325483}
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/BUILD.gn | 7 | ||||
| -rw-r--r-- | sync/sync.gyp | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 3189b23..9a95bb1 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -421,13 +421,6 @@ source_set("sync_core") { deps += [ "//chromeos" ] } - if (is_mac) { - libs = [ - # Required by get_session_name_mac.mm on Mac. - "SystemConfiguration.framework", - ] - } - defines = [ "SYNC_IMPLEMENTATION" ] configs += [ "//build/config/compiler:wexit_time_destructors" ] } diff --git a/sync/sync.gyp b/sync/sync.gyp index d1faafd..89e96ce 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -461,14 +461,6 @@ '../chromeos/chromeos.gyp:chromeos', ], }], - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - # Required by get_session_name_mac.mm on Mac. - '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework', - ] - }, - }], ], }, { |