aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2013-10-24Modify where gtest captured data is stored.Christopher Ferris
Stop using $EXTERNAL_STORAGE for the temporary directory, use $ANDROID_DATA/local/tmp instead. If $ANDROID_DATA is not set, use /tmp (which happens when running a host based gtest). Bug: 11234772 Change-Id: I6c12ea9e6eb281317b48eb672e9a8d294cb1caed
2013-02-14am 8c212ebe: Merge "Only use if it exists and is writable."android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devElliott Hughes
# Via Elliott Hughes (1) and Gerrit Code Review (1) * commit '8c212ebe53bb2baab3575f03069016f1fb11e449': Only use $EXTERNAL_STORAGE if it exists and is writable.
2013-02-14Merge "Only use $EXTERNAL_STORAGE if it exists and is writable."tools_r22jb-mr1.1-dev-plus-aospElliott Hughes
2013-02-14Only use $EXTERNAL_STORAGE if it exists and is writable.Elliott Hughes
Also fail with a clear error if we can't create a temporary file, rather than blindly carrying on and crashing in fseeko much later. The emulator has $EXTERNAL_STORAGE set to a directory that's only usable if you manually supply a valid sdcard image. Bug: 8013987 Change-Id: I51ffc1a5525273752f67a9356ccd272a4507613a
2012-09-26Build gtest against NDK.Ulas Kirazci
Change-Id: If1c9ee7be65d7357b45feb05a849f9b5ca1b22d8
2012-09-12am 344e5f3d: Use instead of /sdcard.Stephen Hines
* commit '344e5f3db17615cc853073a02968a603efd39109': Use $EXTERNAL_STORAGE instead of /sdcard.
2012-09-11Use $EXTERNAL_STORAGE instead of /sdcard.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devStephen Hines
The multi-user changes affect apps launched from the shell (like gtest), so we need to grab the appropriate location dynamically, rather than continuing to hard-code it. Bug: 7121917 Change-Id: I51a58379eff713e63d34a507dc318a138faccb53
2012-08-17am 85030ffa: Merge "Host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato
* commit '85030ffa1dd68c0cc05e9115430f28627996e019': Host modules don't need LOCAL_MODULE_TAGS
2012-08-16Merge "Host modules don't need LOCAL_MODULE_TAGS"tools_r21Joe Onorato
2012-08-15No LOCAL_MODULE_TAGS for host modules.Joe Onorato
Change-Id: Icc84ac8091b8abd0161ca0ea1559df107e50201b
2012-08-14Host modules don't need LOCAL_MODULE_TAGSJoe Onorato
Change-Id: Iee044e545e999cbeef2c4447a550e42aff7dab61
2012-08-07Remove unused astl support, and fix the stlport/host build.Elliott Hughes
Change-Id: I9a6bd154e3e0542bf1f34d9c13b05b2ae42a1727
2012-07-21Host modules don't need LOCAL_MODULE_TAGSJoe Onorato
Change-Id: Iee044e545e999cbeef2c4447a550e42aff7dab61
2012-06-11resolved conflicts for merge of fd5f0270 to jb-dev-plus-aospJean-Baptiste Queru
Change-Id: I6d571215ff13dad8dbd65cf4cb842ddf86fa9642
2012-06-11Merge "gtest: Fix build with gcc 4.7"android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:25:29 +0000