summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 21:00:00 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 21:00:00 +0000
commit34f9023027c289831ce75e778caf9c2aa9ceb714 (patch)
treea6f7ca874cd731728934d0dd8bb959bb205bcbcb
parent2fe8d1914a5f8890792d1afbdd5bb8c769a070e5 (diff)
downloadchromium_src-34f9023027c289831ce75e778caf9c2aa9ceb714.zip
chromium_src-34f9023027c289831ce75e778caf9c2aa9ceb714.tar.gz
chromium_src-34f9023027c289831ce75e778caf9c2aa9ceb714.tar.bz2
Revert 268265 "Add flac into root BUILD.gn"
Caused compile errors on Android GN bot. > Add flac into root BUILD.gn > > All hail GN. oRZ > > BUG=none > > Review URL: https://codereview.chromium.org/263503003 TBR=ajwong@chromium.org Review URL: https://codereview.chromium.org/264173002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268270 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--BUILD.gn1
-rw-r--r--DEPS2
2 files changed, 1 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 1324949..7db5cc0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -38,7 +38,6 @@ group("root") {
#"//sdch",
"//skia",
#"//third_party/WebKit/Source/platform",
- "//third_party/flac",
"//third_party/icu",
"//third_party/leveldatabase",
"//third_party/libpng",
diff --git a/DEPS b/DEPS
index 0878115..5f52155 100644
--- a/DEPS
+++ b/DEPS
@@ -229,7 +229,7 @@ deps = {
"/trunk/deps/third_party/libjpeg_turbo@263594",
"src/third_party/flac":
- "/trunk/deps/third_party/flac@266977",
+ "/trunk/deps/third_party/flac@222897",
"src/third_party/pyftpdlib/src":
(Var("googlecode_url") % "pyftpdlib") + "/trunk@977",