Codebase list mozc / d76bf78
Pull google/googletest@82b11b8cfcca464c2ac74b623d04e74452e74f32 As a preparation of the migration to Visual Studio 2015 Update 1, this CL updates src/third_party/gtest as follows: from: google/googletest@1d53731f2c210557caab5660dbe2c578dce6114f to: google/googletest@82b11b8cfcca464c2ac74b623d04e74452e74f32 Updating gtest also helps us to reduce the number of git submodules because google/googlemock was merged into google/googletest in google/googletest@1f87a0970dc0880c954ea4066fd7b72fad6fb089. Hence we do not need to check out src/third_party/gmock anymore. No behavior change is intended in production binaries. BUG=#315 TEST=unittest REF_BUG= REF_CL=111825865,112890964 Yohei Yukawa 8 years ago
5 changed file(s) with 21 addition(s) and 22 deletion(s). Raw diff Collapse all Expand all
+0
-3
.gitmodules less more
33 [submodule "src/third_party/fontTools"]
44 path = src/third_party/fontTools
55 url = https://github.com/googlei18n/fonttools.git
6 [submodule "src/third_party/gmock"]
7 path = src/third_party/gmock
8 url = https://github.com/google/googlemock.git
96 [submodule "src/third_party/gtest"]
107 path = src/third_party/gtest
118 url = https://github.com/google/googletest.git
+1
-1
src/mozc_version_template.txt less more
00 MAJOR=2
11 MINOR=17
2 BUILD=2318
2 BUILD=2319
33 REVISION=102
44 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
55 # downloaded by NaCl Mozc.
+20
-18
src/testing/testing.gyp less more
5858 'GTEST_LANG_CXX11=1',
5959 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple.
6060 ],
61 'gtest_dir': '<(third_party_dir)/gtest/googletest',
62 'gmock_dir': '<(third_party_dir)/gtest/googlemock',
6163 'conditions': [
6264 ['_toolset=="target" and target_platform=="Android"', {
6365 'gtest_defines': [
7375 ],
7476 },
7577 'sources': [
76 '<(DEPTH)/third_party/gmock/src/gmock-cardinalities.cc',
77 '<(DEPTH)/third_party/gmock/src/gmock-internal-utils.cc',
78 '<(DEPTH)/third_party/gmock/src/gmock-matchers.cc',
79 '<(DEPTH)/third_party/gmock/src/gmock-spec-builders.cc',
80 '<(DEPTH)/third_party/gmock/src/gmock.cc',
81 '<(DEPTH)/third_party/gtest/src/gtest-death-test.cc',
82 '<(DEPTH)/third_party/gtest/src/gtest-filepath.cc',
83 '<(DEPTH)/third_party/gtest/src/gtest-port.cc',
84 '<(DEPTH)/third_party/gtest/src/gtest-printers.cc',
85 '<(DEPTH)/third_party/gtest/src/gtest-test-part.cc',
86 '<(DEPTH)/third_party/gtest/src/gtest-typed-test.cc',
87 '<(DEPTH)/third_party/gtest/src/gtest.cc',
78 '<(gmock_dir)/src/gmock-cardinalities.cc',
79 '<(gmock_dir)/src/gmock-internal-utils.cc',
80 '<(gmock_dir)/src/gmock-matchers.cc',
81 '<(gmock_dir)/src/gmock-spec-builders.cc',
82 '<(gmock_dir)/src/gmock.cc',
83 '<(gtest_dir)/src/gtest-death-test.cc',
84 '<(gtest_dir)/src/gtest-filepath.cc',
85 '<(gtest_dir)/src/gtest-port.cc',
86 '<(gtest_dir)/src/gtest-printers.cc',
87 '<(gtest_dir)/src/gtest-test-part.cc',
88 '<(gtest_dir)/src/gtest-typed-test.cc',
89 '<(gtest_dir)/src/gtest.cc',
8890 ],
8991 'include_dirs': [
90 '<(DEPTH)/third_party/gmock',
91 '<(DEPTH)/third_party/gmock/include',
92 '<(DEPTH)/third_party/gtest',
93 '<(DEPTH)/third_party/gtest/include',
92 '<(gmock_dir)',
93 '<(gmock_dir)/include',
94 '<(gtest_dir)',
95 '<(gtest_dir)/include',
9496 ],
9597 'defines': [
9698 '<@(gtest_defines)',
100102 '<@(gtest_defines)',
101103 ],
102104 'include_dirs': [
103 '<(third_party_dir)/gmock/include',
104 '<(third_party_dir)/gtest/include',
105 '<(gmock_dir)/include',
106 '<(gtest_dir)/include',
105107 ],
106108 },
107109 'conditions': [
+0
-0
src/third_party/gmock less more
(Empty file)
+0
-0
src/third_party/gtest less more
(No changes)