aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-11am 0401a3bf: Merge "add gtest to darwin and windows whitelist for adb_test"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devElliott Hughes
* commit '0401a3bf116e438b2fe7749604f5ea0c6bc996e2': add gtest to darwin and windows whitelist for adb_test
2015-09-11Merge "add gtest to darwin and windows whitelist for adb_test"studio-1.2-releaseElliott Hughes
2015-09-08am 5ab45219: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS."Daniel Erat
* commit '5ab45219a6ad07cc30e6b58fd09371e2a14b93ed': Set LOCAL_EXPORT_C_INCLUDE_DIRS.
2015-09-08Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS."Daniel Erat
2015-09-08Set LOCAL_EXPORT_C_INCLUDE_DIRS.Daniel Erat
Export the include directory so that code linking against gtest doesn't need to manually specify it. Change-Id: Ie6f645e28212a5f82f59085e142ffc3c7c2d78a4
2015-09-07add gtest to darwin and windows whitelist for adb_testSpencer Low
To build adb_test (from system/core/adb) on Windows, gtest is needed, thus add libgtest_host and libgtest_main_host to the whitelist for Windows. Also added to Darwin. Change-Id: Ia38e18bebe40d0061ffe41015dc86c5973f63281 Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-07am 01e30b45: Merge "Add RTTI support to libgtest and libgtest_host."Gilad Arnold
* commit '01e30b453ed9de79e9338ff31733e045862273f6': Add RTTI support to libgtest and libgtest_host.
2015-08-07Merge "Add RTTI support to libgtest and libgtest_host."android-m-preview-2emu-1.4-releaseGilad Arnold
2015-08-06Add RTTI support to libgtest and libgtest_host.Gilad Arnold
This is needed by some newly ported code. Bug: 22827985 Change-Id: I7c7f6efdd203db1af43c9e171400197dc5598a0c
2015-06-16am dabc7dd8: Merge "Use new sanitizer option."Dan Albert
* commit 'dabc7dd8312f9e80db7da26a2ab0eeb0833dd333': Use new sanitizer option.
2015-06-16Merge "Use new sanitizer option."gradle_1.3.1gradle_1.3.0-beta4android-m-preview-1studio-1.3-releaseDan Albert
2015-06-16Use new sanitizer option.Dan Albert
Change-Id: I0e535d0d22ca7868ae1d66e7fdbf41c6bc5e358f
2015-05-28am ae65c436: Merge "Allow to build host gtest libraries in unbundled build."Ying Wang
* commit 'ae65c436cada904c8ac1996a445ec5da66cc129e': Allow to build host gtest libraries in unbundled build.
2015-05-28am e826aa4f: Allow to build host gtest libraries in unbundled build.Ying Wang
* commit 'e826aa4f99cf7d9e57fe9668e299a2808674ede4': Allow to build host gtest libraries in unbundled build.
2015-05-28Merge "Allow to build host gtest libraries in unbundled build."gradle_1.3.0-beta3gradle_1.3.0-beta2studio-1.4-releaseYing Wang
2015-05-27Allow to build host gtest libraries in unbundled build.Ying Wang
You need to include external/libcxx and external/libcxxabi in the unbundled branche's repo manifest, though. Change-Id: I778f36ef941beb932ef28c02188b8c855435b051 (cherry-picked from commit e826aa4f99cf7d9e57fe9668e299a2808674ede4)
2015-05-27Allow to build host gtest libraries in unbundled build.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseYing Wang
You need to include external/libcxx and external/libcxxabi in the unbundled branche's repo manifest, though. Change-Id: I778f36ef941beb932ef28c02188b8c855435b051
2015-04-29Merge "Don't explicitly set LOCAL_CLANG for host."gradle_1.3.0-beta1android-m-previewDan Albert
2015-04-29Don't explicitly set LOCAL_CLANG for host.Dan Albert
Clang is already the default for host builds on Linux and Darwin, and setting this forces Windows to clang as well, which isn't supported yet. Clean up the now redundant LOCAL_ADDITIONAL_DEPENDENCIES while I'm here. Change-Id: I24ee5144f40d10a2064ad12fb5e53c6bc791fe7c
2014-11-20Merge "Use an older standard for the NDK gtest libs."gradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1studio-master-releasestudio-1.1-releaselollipop-wear-releaseDan Albert
2014-11-20Use an older standard for the NDK gtest libs.Dan Albert
stlport is not fully compatible with C++11, and gtest manages to break it. Use an older standard to avoid this. Bug: 18466763 Change-Id: I075219059321cbe9df5f737559e15f8be621213d
2014-11-15Merge "Make the libc++ libraries the primary."studio_1.0.1studio_1.0.0gradle_1.0.1gradle_1.0.0-rc4gradle_1.0.0-rc3gradle_1.0.0-rc2gradle_1.0.0-rc1gradle_1.0.0gradle_0.14.4gradle_0.14.3studio-1.0-releaseDan Albert
2014-11-11Make the libc++ libraries the primary.Dan Albert
The stlport linked libraries are compiled with the NDK, so do not need to be removed. They are being renamed to libstlport_ndk to make their intended use explicit, and should not be used for platform tests. Bug: 15193147 Change-Id: I871e765ae1cd006971542f3926509b85f7edb7e7
2014-11-10Merge "Remove the host libstdc++ compiled libraries."Dan Albert
2014-11-09Remove the host libstdc++ compiled libraries.Dan Albert
Now that we've moved to libc++ as the default, we don't need to sets of libraries for the host. Rename the libc++ versions of the libraries to the normal names. Change-Id: Idba84aedcfeca557f9152129803d9cd50523e722
2014-11-05Merge "Be explicit about the STL for host modules."gradle_0.14.2Dan Albert
2014-11-04Be explicit about the STL for host modules.Dan Albert
Change-Id: If1a12384bf2f61e01ca0cb4de827047932a91c1b
2014-10-23Merge "Never build gtest libs with ASAN."gradle_0.14.1gradle_0.14.0Dan Albert
2014-10-21Never build gtest libs with ASAN.Dan Albert
We can maybe do this once the whole tree has moved to clang, but it isn't feasible to do this for now since it means _every_ test will need to also use clang and link ASAN. Change-Id: I64f08100a23ee4ed794090bcb66b81ee4f1d4b8a
2014-09-26Merge "Don't manually link stlport."android-l-preview_r2ub-tools-idea133-releasel-previewDan Albert
2014-09-26Don't manually link stlport.Dan Albert
Change-Id: I40f9e647ddf8160fd08cc0baef56e1d7fc77a65f
2014-06-10Merge "Add LOCAL_MULTILIB := both for host targets."studio_0.8.6gradle_0.13.3gradle_0.13.2gradle_0.13.1gradle_0.13.0gradle_0.12.2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1adt_23.0.3ub-tools-idea133-milestonelollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseidea133-milestoneidea133Christopher Ferris
2014-06-10Add LOCAL_MULTILIB := both for host targets.Christopher Ferris
Change-Id: Iaded56bc87bdc59058b4d7064eb97fc321d497a0
2014-05-21Merge "Fixes gtest_libc++ on Mac by moving to clang"Dan Albert
2014-05-21Fixes gtest_libc++ on Mac by moving to clangDan Albert
The version of g++ that was being used on Mac was unable to properly resolve some of the template functions. Change-Id: Ieab2c0938638ee0438602e49ac171e58ada2902b
2014-05-16Merge "Don't build libc++ libs for ub branches"Dan Albert
2014-05-16Don't build libc++ libs for ub branchesDan Albert
Change-Id: Ib73f6d38ed7d2bcb759a0f3e4ee44010b552fddc
2014-05-16Merge "Creates gtest libs linked against libc++"Dan Albert
2014-05-16Creates gtest libs linked against libc++Dan Albert
Change-Id: I7d71e1aac072258e62eba7b2bfba9f1ff6f98c82
2014-01-29Merge "Build gtest with NDK 9 for all architectures."idea133-weekly-releaseElliott Hughes
2014-01-28Build gtest with NDK 9 for all architectures.Elliott Hughes
That gives us real regular expressions on all architectures, which lets us pass more of gtest's own unit tests. Change-Id: I05f0232ba9cac485018e3764fa7e8910d19bd8f3
2014-01-29Merge "Clean up the gtest tests."Elliott Hughes
2014-01-28Clean up the gtest tests.Elliott Hughes
There are more tests now, and a lot of the old ones are conveniently gathered into a single .cc file. Change-Id: If0735979ab64ccd082d2b4a3af78e0eab0d2c0d5
2014-01-29Merge "Clean up a little after the gtest 1.7.0 upgrade."Elliott Hughes
2014-01-28Clean up a little after the gtest 1.7.0 upgrade.Elliott Hughes
Change-Id: I320c7159131cb782ede1a3c5cd539b956f77f521
2014-01-29Merge "Upgrade to gtest 1.7.0."Elliott Hughes
2014-01-28Upgrade to gtest 1.7.0.Elliott Hughes
This is part of an attempt to get us back in sync with upstream. They currently have Android support, but it's different from what we've got. Change-Id: I2749ef426a441c0573fbaa5e0e50fd627df75551
2014-01-28Merge "AArch64: Error checking of temporary file handling"Elliott Hughes
2014-01-28AArch64: Error checking of temporary file handlingMarcus Oakland
Failures in the posix::FOpen call in the String GetCapturedString() method of the CapturedStream class were ignored: the file variable was passed to ReadEntireFile(file), causing a segmentation violation without indication as to cause. In this commit GTEST_CHECK_ is now used to provide an indication of the reason for failure. Change-Id: Id419f4fa1f05b5c3ca09a19551747bb5f0ee635f Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2013-10-25Merge "Modify where gtest captured data is stored."Christopher Ferris
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:30:16 +0000