aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-12Merge "Disable the legacy gmock." am: f08eab13dd am: 07fc9d5419 am: 82aa94d19bstudio-3.1.2studio-3.0studio-2.3gradle_3.1.2gradle_3.0.0gradle_2.3.0studio-master-devDan Albert
am: 2275009c36 Change-Id: I5556361f6de932230c2353dec7f0ab39a125afe8
2016-09-12Merge "Disable the legacy gmock." am: f08eab13dd am: 07fc9d5419Dan Albert
am: 82aa94d19b Change-Id: I296904c92bcc6fbb2d78afc752fb38c61b4a3af0
2016-09-12Merge "Disable the legacy gmock." am: f08eab13ddDan Albert
am: 07fc9d5419 Change-Id: Iac1fa3050b835bac026a0556d5aa4b53f0b5c837
2016-09-12Merge "Disable the legacy gmock."Dan Albert
am: f08eab13dd Change-Id: Ifada39be8a3d126e90a4f2a32e1f2f2fc6002b79
2016-09-12Merge "Disable the legacy gmock."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-4mastermainTreehugger Robot
2016-09-08Disable the legacy gmock.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: I4bb73b170555a05ef81ba1207ac524c41395316e
2016-07-27Merge \\\\"Convert Android.mk to Android.bp\\\\" am: f47bfd7f77 am: ↵Dan Willemsen
2e692fb5c3 am: 620cb24079 am: e5ad1eb43c Change-Id: I5d9eaf791a7e4b553b9f3169c7141b04a44f8327
2016-07-27Merge \\\"Convert Android.mk to Android.bp\\\" am: f47bfd7f77 am: 2e692fb5c3Dan Willemsen
am: 620cb24079 Change-Id: I680ca4ed67d800b12b27e2f4bc6662c2389224a1
2016-07-27Merge \\"Convert Android.mk to Android.bp\\" am: f47bfd7f77Dan Willemsen
am: 2e692fb5c3 Change-Id: I5b9e7438a15c12d0ce1dac68760fc9e76a5f351b
2016-07-27Merge \"Convert Android.mk to Android.bp\"Dan Willemsen
am: f47bfd7f77 Change-Id: I9aea1a844c568ae72864f898accdf6a259472c00
2016-07-27Merge "Convert Android.mk to Android.bp"Dan Willemsen
2016-07-25Convert Android.mk to Android.bpDan Willemsen
Change-Id: Icdcae9998eaf5d11941871070c88129523a046aa
2016-07-23Support gmock for Windows. am: a78d46728dElliott Hughes
am: b00e4b33a3 Change-Id: I454ecde88f1a0d764059c8de9e342782d2b3bdad
2016-07-23Support gmock for Windows.Elliott Hughes
am: a78d46728d Change-Id: I319ee95322a128bd1decddac0a5fef6de540e09f
2016-07-22Support gmock for Windows.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-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_r1nougat-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-dr1-releaseElliott Hughes
*** cherrypicked from AOSP (commit ee59f1b2ac12d87b2e65860267a4672ebf7ef7b4) *** Bug: 30268737 Bug: 30100363 Change-Id: Ie9232096d9f9c9cac9a2e7e192e5bf306d182876
2016-07-22Merge \\\\"Support gmock for Windows.\\\\" am: dbda419424 am: 0d5099e3a7 am: ↵Elliott Hughes
4aa05e0152 am: bfb8bab1ac Change-Id: I7b458aed997d11e775a901fe90b8c606c7c860bf
2016-07-22Merge \\\"Support gmock for Windows.\\\" am: dbda419424 am: 0d5099e3a7Elliott Hughes
am: 4aa05e0152 Change-Id: I4826532158e622427f3dccf38486461bfb499609
2016-07-22Merge \\"Support gmock for Windows.\\" am: dbda419424Elliott Hughes
am: 0d5099e3a7 Change-Id: I24e1e864206338c8f937464b264d58bc63a4c96f
2016-07-22Merge \"Support gmock for Windows.\"Elliott Hughes
am: dbda419424 Change-Id: I8f9ea08579df7909e4caff8f0402661c07ca07c4
2016-07-22Merge "Support gmock for Windows."Treehugger Robot
2016-07-22Support gmock for Windows.Elliott Hughes
Bug: http://b/30268737 Change-Id: Ie9232096d9f9c9cac9a2e7e192e5bf306d182876
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4 am: ↵Chih-hung Hsieh
7c0e9cc0a7 am: 97d528711d am: bfa8913d6e * commit 'bfa8913d6e0eb7cc71de6ef52bd88bf73be57bd5': Fix google-explicit-constructor warnings. Change-Id: I65905ea8da755ab854109b691ec285370ac5645e
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4 am: 7c0e9cc0a7Chih-Hung Hsieh
am: 97d528711d * commit '97d528711d20c4c1975f204dad114d48008198eb': Fix google-explicit-constructor warnings. Change-Id: I6ed0d2809ae69d95706f684616ea997dc51d7bd7
2016-05-10Merge "Fix google-explicit-constructor warnings." am: f68c7ea3c4Chih-hung Hsieh
am: 7c0e9cc0a7 * commit '7c0e9cc0a76402a932a1093289f9c13e58ae0ee3': Fix google-explicit-constructor warnings. Change-Id: Ie5a2092abae1edb68d344c21863b8f8bd1ee9191
2016-05-10Merge "Fix google-explicit-constructor warnings."Chih-Hung Hsieh
am: f68c7ea3c4 * commit 'f68c7ea3c48b8c60d79f71f02f4188b42a5dfc1c': Fix google-explicit-constructor warnings. Change-Id: Ic32d1dc9530d29d974678eed7287ff574d8f36d9
2016-05-10Merge "Fix google-explicit-constructor warnings."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Chih-hung Hsieh
2016-05-06Fix google-explicit-constructor warnings.Chih-Hung Hsieh
Bug: 28341362 Change-Id: I2fc2f1469a60d20b302bf5cdd647fb0fba397313
2016-02-23Merge "external/gmock: Silence warnings by using the correct LOCAL_CFLAGS."android-n-preview-2android-n-preview-1James Hawkins
2016-02-22external/gmock: Silence warnings by using the correct LOCAL_CFLAGS.James Hawkins
Bug: 26936282 Change-Id: I3bb76da388e841e2edd9d0a229049f3fc9cf5bb5
2015-08-27am 0797b0e5: (-s ours) am 92f488a5: am b4a61987: Merge "Add RTTI support to ↵studio-master-dev_before_27917934studio-master-dev_before_26911779studio-2.0-rc1studio-2.0studio-1.5gradle_2.0.0gradle_1.5.0android-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.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_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-releasebrillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-devGilad Arnold
libgmock and libgmock_host." * commit '0797b0e5d5d352ebe2bef6147bdf3e20c99f770c':
2015-08-27am 830d4aaa: (-s ours) am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
* commit '830d4aaa0c9fb4b5f735e50f81443283062466e3':
2015-08-27am e9c3b955: (-s ours) am c6c28851: am 211806ad: Merge "Use new sanitizer ↵Christopher Wiley
option." * commit 'e9c3b955b804ad6744f52fde2ad3cef71b5c1c74':
2015-08-27am 25c19e6f: (-s ours) resolved conflicts for merge of 62789539 to ↵Christopher Wiley
mnc-dev-plus-aosp * commit '25c19e6fd44af4164148a4f1b5831b24af05a025':
2015-08-27am 1e6be7df: (-s ours) am e36200f7: am 370e17e7: Merge "Initial drop of ↵Tamas Berghammer
gmock 1.7.0" * commit '1e6be7df74bc39d489390be3a51d3611815862d7':
2015-08-07am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and ↵brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devGilad Arnold
libgmock_host." * commit '92f488a5787170b385cc3288afd62cfcf67540a0': Add RTTI support to libgmock and libgmock_host.
2015-08-07am 92f488a5: am b4a61987: Merge "Add RTTI support to libgmock and ↵studio-1.4Gilad Arnold
libgmock_host." * commit '92f488a5787170b385cc3288afd62cfcf67540a0': Add RTTI support to libgmock and libgmock_host.
2015-08-07am b4a61987: Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold
* commit 'b4a61987d59d1d721598809e93f4a8dffc81ea27': Add RTTI support to libgmock and libgmock_host.
2015-08-07Merge "Add RTTI support to libgmock and libgmock_host."Gilad Arnold
2015-08-06Add RTTI support to libgmock and libgmock_host.Gilad Arnold
This is needed by some newly ported code. Bug: 22827985 Change-Id: I0e1a5992f2d90c73b669251c62f8195d39ac413a
2015-07-24am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
* commit '9f4f202c0aaa4c341e8f897bf05549327ea4aa55': Export gmock headers
2015-07-24am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
* commit 'c6c2885185ac02e58fdefac4e38fb5f8a6d194f3': Use new sanitizer option.
2015-07-24resolved conflicts for merge of 62789539 to mnc-dev-plus-aospChristopher Wiley
Change-Id: Ib8c51e77ec5a1de16dacbf374d934ddf5c734bdf
2015-07-24am 9f4f202c: am 7c900060: Merge "Export gmock headers"Christopher Wiley
* commit '9f4f202c0aaa4c341e8f897bf05549327ea4aa55': Export gmock headers
2015-07-24am c6c28851: am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
* commit 'c6c2885185ac02e58fdefac4e38fb5f8a6d194f3': Use new sanitizer option.
2015-07-24resolved conflicts for merge of 62789539 to mnc-dr-dev-plus-aospChristopher Wiley
Change-Id: Ib57ba4362675c43950d7c87a3d64d945cde45894
2015-07-24am 7c900060: Merge "Export gmock headers"Christopher Wiley
* commit '7c90006054e868c645be41dcfbe551be4382f69d': Export gmock headers
2015-07-24am 211806ad: Merge "Use new sanitizer option."Christopher Wiley
* commit '211806ade546b5e3ca3cc320796fe9983ec5ea1e': Use new sanitizer option.
2015-07-24am 9539beb2: Merge "Tweaks for googlemock."Christopher Wiley
* commit '9539beb282149fec80fd7150060b22ea7e379a3c': Tweaks for googlemock.
2015-07-24Merge "Export gmock headers"Christopher Wiley
2015-07-24Merge "Use new sanitizer option."Christopher Wiley
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 23:51:07 +0000