aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-13Merge "Revert "Disable the legacy gtest.""HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermainemu-master-qemu-releaseemu-2.8-releaseemu-2.7-releaseemu-2.6-releaseemu-2.5-releaseemu-2.4-releaseemu-2.3-releaseTreehugger Robot
2016-09-12Revert "Disable the legacy gtest."Dan Albert
Apparently there are dozens of other builds using this that aren't using the Android build system. I'm not going to go fix all of them, so just put all the source back. This project has been removed from the master manifest, so nothing here should be colliding with the real one in external/googletest. This reverts commit 0af8635d8866bdfdc72b1070f041ada1ac136e3f. Bug: http://b/16574165 Change-Id: Ie07a8156281a1dab9885eef64788fe362d4e3c36
2016-09-12Merge "Disable the legacy gtest."Treehugger Robot
2016-09-08Disable the legacy gtest.Dan Albert
Remove everything so people don't accidentally get these includes, and to make it clear that this isn't used any more. Bug: http://b/16574165 Change-Id: I9520aed44f0caa94079f2c00da358076bb9ce574
2016-06-02Merge "Remove deprecated Android.mk files" am: 4d0dff7238Colin Cross
am: 5d15e090c0 * commit '5d15e090c097bc7107512d5fbe9a4859854d5674': Remove deprecated Android.mk files Change-Id: Ia75f99ade1ba7ff04480e0050a721b8b6ff2d0fa
2016-06-02Merge "Remove deprecated Android.mk files"Colin Cross
am: 4d0dff7238 * commit '4d0dff7238a66882c16e7115bbf8e169fd363ce2': Remove deprecated Android.mk files Change-Id: I45c6ec5ee4bc59912bed941c0c6da67f20c5fa51
2016-06-02Merge "Remove deprecated Android.mk files"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2emu-2.2-releaseColin Cross
2016-05-27Merge "gtest: Add support for std::unique_ptr bool conversion" am: 0e40459835Luis Hector Chavez
am: 62fa5823cc * commit '62fa5823cce4c13f024d9412df9aed61d5733a22': gtest: Add support for std::unique_ptr bool conversion Change-Id: I92eaa762e9d37a6538830aa1239553ae6689287c
2016-05-27Merge "gtest: Add support for std::unique_ptr bool conversion"Luis Hector Chavez
am: 0e40459835 * commit '0e40459835dbefebda48820b9eb7cc9b16855274': gtest: Add support for std::unique_ptr bool conversion Change-Id: I82117e03eeeba3b163b2487255e05e8d0b8b5eed
2016-05-27Merge "gtest: Add support for std::unique_ptr bool conversion"Treehugger Robot
2016-05-26Remove deprecated Android.mk filesColin Cross
These directories all have Android.bp files that are always used now, delete the Android.mk files. Change-Id: I8e99d075162d5669218123c273af100bd54420c6
2016-05-26gtest: Add support for std::unique_ptr bool conversionLuis Hector Chavez
This cherry-picks the new AssertionResult constructor that supports contextual conversion to bool, found in https://github.com/google/googletest/commit/8120f66c3249e253f03fdb48bee7e528bc038d31 This is needed to support a libchrome uprev. BUG: 28985443 TEST: All tests in libchrome_test pass on dragonboard-eng build Change-Id: I59bc96f785e97a1c6abfa492f72278cb99213303
2016-05-04Merge "Allow libgtest on unbundled builds" am: 55cc0e85b9Colin Cross
am: 529764ba68 * commit '529764ba68dd5573e636e21e812ca1e4774df6b6': Allow libgtest on unbundled builds Change-Id: I9c7138f7f0c7462ede07322710580ae9aa3eece3
2016-05-04Merge "Allow libgtest on unbundled builds"Colin Cross
am: 55cc0e85b9 * commit '55cc0e85b97b656885aaab8d5688ff9b32bc7e88': Allow libgtest on unbundled builds Change-Id: I76fd1a11e62ac31dd817681340f96ff0cfecc6b5
2016-05-04Merge "Allow libgtest on unbundled builds"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3Treehugger Robot
2016-05-04Allow libgtest on unbundled buildsColin Cross
It's unclear why libgtest was ever disabled for unbundled builds, and soong gets confused seeing a module that exists and is needed by a module but is marked disabled. Change-Id: I264f2377f9f2c42e0e778761b4392da286fa3ec4
2016-05-04Merge "Update Android.bp to match Android.mk" am: a2a1af6d88Colin Cross
am: e3745d8441 * commit 'e3745d84419dd2604e5eb8c15daa208defc2393f': Update Android.bp to match Android.mk Change-Id: If8217f7dcc5657884ae9a4e33d80ddd801a890ea
2016-05-04Merge "Update Android.bp to match Android.mk"Colin Cross
am: a2a1af6d88 * commit 'a2a1af6d88e870e104a7d899a158ec241f07e71c': Update Android.bp to match Android.mk Change-Id: If520b74034c08ffca8bafae523a5194952c06c6c
2016-05-04Merge "Update Android.bp to match Android.mk"Colin Cross
2016-05-02Update Android.bp to match Android.mkColin Cross
Change-Id: Ia4473fb23811f4b2839d52e81830a309ff89c722
2016-04-26Merge "Allow libgtest_prod on Windows." am: bb7fb4eTreehugger Robot
am: b688b3c * commit 'b688b3ca564cdd9a32882e3b20160cffab4b1e0f': Allow libgtest_prod on Windows. Change-Id: I07723bba49ba399c5c74025022c228a48f92972d
2016-04-26Merge "Allow libgtest_prod on Windows."Dan Albert
am: bb7fb4e * commit 'bb7fb4e07c39765517b6bedb7e558e0fa7d27e5c': Allow libgtest_prod on Windows. Change-Id: I6decfb74ce873faab6889ec57ec924d137322310
2016-04-26Merge "Allow libgtest_prod on Windows."Treehugger Robot
2016-04-26Allow libgtest_prod on Windows.Dan Albert
Change-Id: I4c0a09c4635b22d3f51509087671f1d9a92500b8
2016-04-19Merge "Update sanitize property format" am: edbd10348fColin Cross
am: e4e99a3731 * commit 'e4e99a3731619492ec1882fd85e63f1b76988fb2': Update sanitize property format Change-Id: Iec91b0be95385b7f7577492a43f6197ade627b80
2016-04-19Merge "Update sanitize property format"Colin Cross
am: edbd10348f * commit 'edbd10348f7260d429b36e971e0d02da8a7378a4': Update sanitize property format Change-Id: If026b2fd13de3529e883a22dc5eba00365932eae
2016-04-19Merge "Update sanitize property format"Colin Cross
2016-04-07Update sanitize property formatColin Cross
Change-Id: I67b2643903e2318ffdb35d2084a89a773e33a74c
2016-03-30Merge "Revert "Revert "Add libgtest_prod.""" am: 9bf0192Dan Albert
am: 658729b * commit '658729bc0290ac05ae59b66bb2eedce3ab99ada2': Revert "Revert "Add libgtest_prod."" Change-Id: Ie98e31acc1b77095f101c08aec01a8ebdb67bafe
2016-03-30Merge "Revert "Revert "Add libgtest_prod."""Dan Albert
am: 9bf0192 * commit '9bf0192fe4271426b18229de49f6ad098e54ef30': Revert "Revert "Add libgtest_prod."" Change-Id: I979cedf4c21d487ea71c143d2a291158f996cb6d
2016-03-30Merge "Revert "Revert "Add libgtest_prod."""android-n-preview-2Dan Albert
2016-03-30Revert "Revert "Add libgtest_prod.""Dan Albert
The Mac build supports header only libraries now. This reverts commit baa71b273e408ee0401c87792507ef6d188593a6. Bug: http://b/16574165 Change-Id: I08ab68f3504cbd43dad995c1aa248412af8576a7
2016-03-28Merge "Update Android.bp to match Android.mk"Colin Cross
am: 6ab4609 * commit '6ab460936e7ffb913a72016403c97bfaf0e9df90': Update Android.bp to match Android.mk
2016-03-28Merge "Update Android.bp to match Android.mk"Colin Cross
2016-03-25Update Android.bp to match Android.mkColin Cross
Change-Id: I5aabcdebfcea0ebe6d6f99c67a2ba0f893251a24
2016-03-24Merge "Add gtest libs for all NDK STLs."Dan Albert
am: 946b287 * commit '946b287abdafbe9ae8105ca31a4d8a5b0d9cec7f': Add gtest libs for all NDK STLs.
2016-03-24Merge "Add gtest libs for all NDK STLs."Dan Albert
2016-03-22Add gtest libs for all NDK STLs.Dan Albert
Any tests built with gtest need to use the same STL that gtest was built with, so we need one per STL. Bug: http://b/27801981 Change-Id: Iea780479afe8a184d486638424a4911f6e01c9b9
2016-03-16Merge "Revert "Add libgtest_prod.""Dan Albert
am: 0b16dd0 * commit '0b16dd0724bd060293712350d1a8030bbeedff11': Revert "Add libgtest_prod."
2016-03-16Merge "Revert "Add libgtest_prod.""Dan Albert
2016-03-16Revert "Add libgtest_prod."Dan Albert
Darwin doesn't support our implementation of header only static libraries. Reverting to fix the build until we find a solution. This reverts commit 18d1e9ca582db6db2fcf64876b0d59e47a026adc. Change-Id: I5c878280b909dd7c1649b3f4a3c090d10d046046
2016-03-16Merge "Add libgtest_prod."Dan Albert
am: 385bc12 * commit '385bc12a1941581f6d202b4cfda3e12e48054f6b': Add libgtest_prod.
2016-03-16Merge "Add libgtest_prod."Dan Albert
2016-03-07Add libgtest_prod.Dan Albert
This is a header only library that can be used by modules that need FRIEND_TEST. If used in a module's public headers, use LOCAL_WHOLE_STATIC_LIBRARIES so that the module's users will also have the headers available. Bug: http://b/16574165 Change-Id: I09a87e44350f437acb74cb4298aa480bcc9748b7
2016-01-15Implement GetThreadCount for Linux.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1afw-test-harness-2.1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasekosak
(cherry picked from commit 34114d43af2ef5c5fdf773abe8080ca504737e23)
2016-01-15Merge "Implement GetThreadCount for Linux." am: 0374ec7859Colin Cross
am: ed8c307213 -s ours * commit 'ed8c307213d2a88e4e256bdb3698f082e9adc7a2': Implement GetThreadCount for Linux.
2016-01-15Merge "Implement GetThreadCount for Linux."Colin Cross
am: 0374ec7859 * commit '0374ec7859e7efea8e58353fd1b0a7e5293119ea': Implement GetThreadCount for Linux.
2016-01-15Merge "Implement GetThreadCount for Linux."android-n-preview-1emu-2.0-releasebrillo-m10-releasebrillo-m10-devColin Cross
2016-01-14Implement GetThreadCount for Linux.kosak
2015-12-21Merge "Remove extra cc_test options" am: b34755199fstudio-2.0-rc1studio-2.0gradle_2.0.0Dan Willemsen
am: d370feffd6 * commit 'd370feffd6b9f0d8df8f222d9c22dd32cce5532b': Remove extra cc_test options
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:02:54 +0000