summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2014-09-27 18:46:57 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-28 01:47:14 +0000
commitfd1b08582a03e13af0ed5136473d447065947e96 (patch)
tree108d4b5b029e811bc6faf996f79e6d6c8e40b0a5
parenta09df11aa1c5f416df4fb97f2303d9c1ff76b150 (diff)
downloadchromium_src-fd1b08582a03e13af0ed5136473d447065947e96.zip
chromium_src-fd1b08582a03e13af0ed5136473d447065947e96.tar.gz
chromium_src-fd1b08582a03e13af0ed5136473d447065947e96.tar.bz2
Enable the dependency on google_toolbox_for_mac.
We converted this target to GN already, so app_list can depend on it as is. This should address the TODO(GYP) in the BUILD.gn file. BUG=None TEST=None R=brettw@chromium.org TBR=xiyuan@chromium.org,mark@chromium.org Review URL: https://codereview.chromium.org/590863002 Cr-Commit-Position: refs/heads/master@{#297123}
-rw-r--r--third_party/google_toolbox_for_mac/BUILD.gn (renamed from build/secondary/third_party/google_toolbox_for_mac/BUILD.gn)0
-rw-r--r--ui/app_list/BUILD.gn2
2 files changed, 1 insertions, 1 deletions
diff --git a/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn b/third_party/google_toolbox_for_mac/BUILD.gn
index 1977a06..1977a06 100644
--- a/build/secondary/third_party/google_toolbox_for_mac/BUILD.gn
+++ b/third_party/google_toolbox_for_mac/BUILD.gn
diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn
index 886eeee..c4ed603 100644
--- a/ui/app_list/BUILD.gn
+++ b/ui/app_list/BUILD.gn
@@ -168,7 +168,7 @@ component("app_list") {
"cocoa/scroll_view_with_no_scrollbars.mm",
]
deps += [
- #"../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac", TODO(GYP)
+ "//third_party/google_toolbox_for_mac",
]
libs = [ "QuartzCore.framework" ]
}