Update gclient configuation for DEPS and git repository.
Change-Id: I49845a0a4e660027dd817b7a783163c1aa5d04d7
diff --git a/.gclient b/.gclient
new file mode 100644
index 0000000..77bf7d2
--- /dev/null
+++ b/.gclient
@@ -0,0 +1,7 @@
+solutions = [ {
+ u'managed': False,
+ u'name': u'.',
+ u'url': u'https://chromium.googlesource.com/angle/angle',
+ u'custom_deps': { },
+ u'deps_file': u'DEPS'
+} ]
\ No newline at end of file
diff --git a/DEPS b/DEPS
index 1e5112c..73679f5 100644
--- a/DEPS
+++ b/DEPS
@@ -1,18 +1,18 @@
deps = {
- "trunk/third_party/gyp":
- "http://gyp.googlecode.com/svn/trunk@1564",
+ "third_party/gyp":
+ "http://gyp.googlecode.com/svn/trunk@1767",
- "trunk/third_party/googletest":
- "http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0
+ "third_party/googletest":
+ "http://googletest.googlecode.com/svn/trunk@629",
- "trunk/third_party/googlemock":
- "http://googlemock.googlecode.com/svn/trunk@387", #release 1.6.0
+ "third_party/googlemock":
+ "http://googlemock.googlecode.com/svn/trunk@410",
}
hooks = [
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
- "action": ["python", "trunk/build/gyp_angle"],
+ "action": ["python", "build/gyp_angle"],
},
]
diff --git a/build/gyp_angle b/build/gyp_angle
index 2aa38a5..6533d36 100644
--- a/build/gyp_angle
+++ b/build/gyp_angle
@@ -25,7 +25,7 @@
# Set the depth to get the top-level Makefile generated into the
# correct directory. This only has an effect on Linux.
args.append('--depth');
- args.append('./trunk');
+ args.append('.');
# Add common.gypi to the include path.
args.append('-I' + os.path.join(script_dir, 'common.gypi'))
# Add all.gyp as the main gyp file to be generated.
diff --git a/tests/build_tests.gyp b/tests/build_tests.gyp
index aa930f1..d485c83 100644
--- a/tests/build_tests.gyp
+++ b/tests/build_tests.gyp
@@ -14,6 +14,14 @@
'sources': [
'../third_party/googletest/src/gtest-all.cc',
],
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ },
},
{
'target_name': 'gmock',
@@ -26,6 +34,14 @@
'sources': [
'../third_party/googlemock/src/gmock-all.cc',
],
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ },
},
{
'target_name': 'preprocessor_tests',
