Commit ac799c2f authored by rsesek's avatar rsesek Committed by Commit bot

Revert of [Mac/GN] Explicitly link ApplicationServices wherever CoreGraphics...

Revert of [Mac/GN] Explicitly link ApplicationServices wherever CoreGraphics is linked. (patchset #2 id:20001 of https://codereview.chromium.org/2092513002/ )

Reason for revert:
After https://crrev.com/42e3c3e7125d the build warns if it detects this incompatibility.

Original issue's description:
> [Mac/GN] Explicitly link ApplicationServices wherever CoreGraphics is linked.
>
> The 10.11 SDK has an incompatibility with a OS X 10.7 deployment target.
> ApplicationServices re-exports CoreGraphics, but due to a bug, the dylib
> compatibility version from the re-exported framework gets confused with
> the version of the framework doing the re-export.
>
> This only manifests itself in the component build because individual
> components depend on CoreGraphics directly instead of ApplicationServices.
> In the static library build, the transitive collection of libs ensures that
> ApplicationServices gets linked before CoreGraphics when linking the
> Chromium Framework, so this doesn't occur.
>
> To hack around the issue, specify ApplicationServices in libs ahead of
> CoreGraphics so that the correct compatibility version is picked up. After
> the deployment is updated to 10.8+ (https://crbug.com/580152) these hacks
> can be removed.
>
> BUG=620127
> R=mark@chromium.org
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
>
> Committed: https://chromium.googlesource.com/chromium/src/+/5f7bc190c7ffeda2a2c56161b371bc16750fac2c

TBR=mark@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=620127

Review-Url: https://codereview.chromium.org/2118563002
Cr-Commit-Position: refs/heads/master@{#403392}
parent cddabc92
...@@ -78,9 +78,8 @@ source_set("ipc_service_sources") { ...@@ -78,9 +78,8 @@ source_set("ipc_service_sources") {
deps += [ "//ui/accelerated_widget_mac" ] deps += [ "//ui/accelerated_widget_mac" ]
lib_dirs = [ "$mac_sdk_path/usr/lib" ] lib_dirs = [ "$mac_sdk_path/usr/lib" ]
libs += [ libs += [
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreGraphics.framework",
"QuartzCore.framework", "QuartzCore.framework",
"CoreGraphics.framework",
] ]
} }
if (is_android) { if (is_android) {
......
...@@ -363,7 +363,6 @@ component("media") { ...@@ -363,7 +363,6 @@ component("media") {
if (is_mac) { if (is_mac) {
public_deps += [ "//media/base/mac" ] public_deps += [ "//media/base/mac" ]
libs += [ libs += [
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"Foundation.framework", "Foundation.framework",
......
...@@ -106,7 +106,6 @@ component("capture") { ...@@ -106,7 +106,6 @@ component("capture") {
if (is_mac) { if (is_mac) {
deps += [ "//third_party/decklink" ] deps += [ "//third_party/decklink" ]
libs = [ libs = [
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"CoreVideo.framework", "CoreVideo.framework",
......
...@@ -522,7 +522,6 @@ component("skia") { ...@@ -522,7 +522,6 @@ component("skia") {
if (is_mac) { if (is_mac) {
libs = [ libs = [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"CoreText.framework", "CoreText.framework",
......
...@@ -39,7 +39,6 @@ component("accelerated_widget_mac") { ...@@ -39,7 +39,6 @@ component("accelerated_widget_mac") {
] ]
libs = [ libs = [
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"AVFoundation.framework", "AVFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"Foundation.framework", "Foundation.framework",
......
...@@ -113,7 +113,6 @@ component("display") { ...@@ -113,7 +113,6 @@ component("display") {
if (is_mac) { if (is_mac) {
libs = [ libs = [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreGraphics.framework", "CoreGraphics.framework",
] ]
} }
......
...@@ -380,7 +380,6 @@ component("gfx") { ...@@ -380,7 +380,6 @@ component("gfx") {
if (is_mac) { if (is_mac) {
libs = [ libs = [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"CoreText.framework", "CoreText.framework",
......
...@@ -58,9 +58,8 @@ component("native_theme") { ...@@ -58,9 +58,8 @@ component("native_theme") {
if (is_mac) { if (is_mac) {
libs = [ libs = [
"AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreGraphics.framework", "CoreGraphics.framework",
"AppKit.framework",
] ]
} }
} }
......
...@@ -63,7 +63,6 @@ component("snapshot") { ...@@ -63,7 +63,6 @@ component("snapshot") {
if (is_mac) { if (is_mac) {
libs = [ libs = [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreGraphics.framework", "CoreGraphics.framework",
] ]
} }
......
...@@ -141,7 +141,6 @@ component("views") { ...@@ -141,7 +141,6 @@ component("views") {
] ]
libs = [ libs = [
"AppKit.framework", "AppKit.framework",
"ApplicationServices.framework", # Temporary hack around https://crbug.com/620127. Remove after https://crbug.com/622481 is fixed.
"CoreGraphics.framework", "CoreGraphics.framework",
"Foundation.framework", "Foundation.framework",
"QuartzCore.framework", # Required by bridged_native_widget.mm. "QuartzCore.framework", # Required by bridged_native_widget.mm.
......
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