Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: DEPS

Issue 10831270: Eliminate build differences in nacl gated on nacl_standalone. Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # DEPS files look like -*- Python -*- 1 # DEPS files look like -*- Python -*-
2 2
3 vars = { 3 vars = {
4 # When possible, keep chrome_rev and chromebinaries_rev at the same 4 # When possible, keep chrome_rev and chromebinaries_rev at the same
5 # value. chromebinaries_rev should match LKGR so that we can download 5 # value. chromebinaries_rev should match LKGR so that we can download
6 # the binaries, but sometimes chrome_rev needs to be more recent to get 6 # the binaries, but sometimes chrome_rev needs to be more recent to get
7 # source changes when LKGR is lagging too far back. 7 # source changes when LKGR is lagging too far back.
8 "chromebinaries_rev": "147940", 8 "chromebinaries_rev": "147940",
9 "chrome_rev": "147940", 9 "chrome_rev": "147940",
10 # NOTE! These four should match their counterparts in chromium/src/DEPS. 10 # NOTE! These four should match their counterparts in chromium/src/DEPS.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 (Var("chromium_trunk") + "/tools/build/third_party/simplejson@" + 78 (Var("chromium_trunk") + "/tools/build/third_party/simplejson@" +
79 Var("chrome_rev")), 79 Var("chrome_rev")),
80 "third_party/tlslite": 80 "third_party/tlslite":
81 Var("chromium_trunk") + "/src/third_party/tlslite@" + Var("chrome_rev"), 81 Var("chromium_trunk") + "/src/third_party/tlslite@" + Var("chrome_rev"),
82 "tools/clang": 82 "tools/clang":
83 Var("chromium_trunk") + "/src/tools/clang@" + Var("chrome_rev"), 83 Var("chromium_trunk") + "/src/tools/clang@" + Var("chrome_rev"),
84 "tools/gyp": 84 "tools/gyp":
85 "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"), 85 "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
86 "tools/valgrind": 86 "tools/valgrind":
87 Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chrome_rev"), 87 Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chrome_rev"),
88 "tools/win":
89 Var("chromium_trunk") + "/src/tools/win@" + Var("chrome_rev"),
88 } 90 }
89 91
90 deps_os = { 92 deps_os = {
91 "win": { 93 "win": {
92 # GNU binutils assembler for x86-32. 94 # GNU binutils assembler for x86-32.
93 "third_party/gnu_binutils": 95 "third_party/gnu_binutils":
94 (Var("native_client_trunk") + "/deps/third_party/gnu_binutils@" + 96 (Var("native_client_trunk") + "/deps/third_party/gnu_binutils@" +
95 Var("tools_rev")), 97 Var("tools_rev")),
96 # GNU binutils assembler for x86-64. 98 # GNU binutils assembler for x86-64.
97 "third_party/mingw-w64/mingw/bin": 99 "third_party/mingw-w64/mingw/bin":
(...skipping 23 matching lines...) Expand all
121 { 123 {
122 "pattern": ".", 124 "pattern": ".",
123 "action": ["python", "native_client/build/gyp_nacl"], 125 "action": ["python", "native_client/build/gyp_nacl"],
124 }, 126 },
125 ] 127 ]
126 128
127 include_rules = [ 129 include_rules = [
128 "+native_client/src/include", 130 "+native_client/src/include",
129 "+gtest", 131 "+gtest",
130 ] 132 ]
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698