aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2013-04-24 14:18:45 +0200
committerDavid 'Digit' Turner <digit@android.com>2013-04-25 23:45:48 +0200
commit735d57d5d1c055db9e0ef28857e8dc7b3d7d6b9b (patch)
tree8005776fcb81932769a0be0cc07c379dd43daf07 /.gitignore
parent8726c44639e6189d8bee4a46134cf744a9696bb1 (diff)
downloadndk-735d57d5d1c055db9e0ef28857e8dc7b3d7d6b9b.tar.gz
Add GoogleTest to the NDK.
This patch adds the following: - sources/third_party/googletest/googletest/: The sources for the latest GoogleTest revision. - sources/third_party/googletest/patches.ndk/: The patches applied to the upstream sources. - sources/third_party/googletest/README.NDK: Readme file explaining what this is + basic usage instructions. - sources/third_party/googletest/Android.mk: Build file declaring the modules to be imported to use GoogleTest - tests/device/test-googletest-stlport: Simple test to build GoogleTest against STLport and run a few sample programs. - tests/device/test-googletest-gnustl: Same as above, but linking against GNU libstdc++. This is required because GoogleTest will compile differently based on the features of the C++ STL being used (e.g. STLport doesn't have <tr1/tuple>) - tests/device/test-googletest-full: The full GoogleTest unit test program (740 tests). Ignored by tests/run-tests.sh by default since it's long to build and run. + Update .gitignore to only ignore the top-level 'samples' directory. Change-Id: I6ed5bc55d16f513daa8e237096c3f6771c2d9772
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 37274a7e1..d952baf61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
Thumbs.db
local.properties
build.xml
-samples/
+/samples/
platforms/
toolchains/*/prebuilt/
/ndk-stack*