Source release v2.2.0-0-903 + third_party libs
Change-Id: I03f670eaeb052bc741abb347be06f8ddc58418e7
This commit is contained in:
38
third_party/gmock.gyp
vendored
Normal file
38
third_party/gmock.gyp
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
# Copyright 2013 Google Inc. All Rights Reserved.
|
||||
{
|
||||
'target_defaults': {
|
||||
'type': 'static_library',
|
||||
'include_dirs': [
|
||||
'gmock',
|
||||
'gmock/include',
|
||||
'gmock/gtest',
|
||||
'gmock/gtest/include',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'gmock/include',
|
||||
'gmock/gtest/include',
|
||||
],
|
||||
},
|
||||
},
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'gmock',
|
||||
'sources': [
|
||||
'gmock/src/gmock-all.cc',
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'gmock_main',
|
||||
'sources': [
|
||||
'gmock/src/gmock_main.cc',
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'gtest',
|
||||
'sources': [
|
||||
'gmock/gtest/src/gtest-all.cc',
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
9
third_party/gmock/README.android
vendored
9
third_party/gmock/README.android
vendored
@@ -14,6 +14,13 @@ needs a different format of build script, and it needs to build against the OS'
|
||||
modified version of gTest, rather than the packaged version.
|
||||
|
||||
Local Modifications:
|
||||
--Tue Jun 3, 2014 (joeyparrish)--
|
||||
|
||||
Removed DOS newlines for the sake of the git-to-piper bridge. Piper converts
|
||||
newlines automatically to unix style. If this change is not made in git, the
|
||||
bridge detects differences and attempts to sync to piper, even when nothing
|
||||
has changed in git.
|
||||
|
||||
--Mon Feb 4, 2014 (juce)--
|
||||
|
||||
Upgraded to gMock 1.7.0. This is required for compatibility with the upgrade
|
||||
@@ -59,4 +66,4 @@ Excluded the following files from being copied to Android repo:
|
||||
make/
|
||||
msvc/
|
||||
fused-src/
|
||||
gtest/
|
||||
gtest/
|
||||
|
||||
Reference in New Issue
Block a user