summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-08release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release- ↵android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
4080221 snap-temp-L23400000072087081 Change-Id: I5e6ebe52be9ceaeb77ae10543d4111639ba517de
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17 am: ↵oreo-mr1-devoreo-dr1-devChih-hung Hsieh
246a02724b am: ddc7186be0 Change-Id: I9eb70537d4553578241194fa9fda91e873b4b435
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55 am: 07c9d5af17android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: 246a02724b Change-Id: I763acf131bf008fd4b590f1d74fb1585b07fd8ee
2017-06-06Merge "Add OWNERS in external/mockito" am: 0211c64d55Chih-hung Hsieh
am: 07c9d5af17 Change-Id: Ic05a64850960a629933b60bba236c24dcbfc29b2
2017-06-06Merge "Add OWNERS in external/mockito"Chih-hung Hsieh
am: 0211c64d55 Change-Id: I2d1d4b84577ebf94fc9d22704d371061bf169ca1
2017-06-06Merge "Add OWNERS in external/mockito"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/mockitoChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I4f9b5fb3a1506a4cd6e2acd028e91a4f0da7605e
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118 ↵android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
am: 2916273738 am: 040b2c0a15 Change-Id: I46441d26b2257ba71f39a009ccd9039a0b3d01d1
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files" am: 03585bc118Paul Duffin
am: 2916273738 Change-Id: I15b93df39518c96865396bcd714d6722b9e7c62f
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
am: 03585bc118 Change-Id: I8015d3e020cff8e2dc71c6568eb5a0bf698a36e5
2017-03-24Merge "Update .gitignore file to ignore IntelliJ IDEA files"Treehugger Robot
2017-03-24Update .gitignore file to ignore IntelliJ IDEA filesPaul Duffin
Test: git status to make sure the files do not appear Change-Id: I4f03b2a44fe05ca5831511f3fdd41e364e3faf2d
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7 am: ↵Paul Duffin
bc54862ce5 am: 1a2f33483f Change-Id: I4f071e00edebab29254318e8229ac3c6e8b61979
2017-03-17Merge "Remove unneeded call to all-makefiles-under" am: 8367d36ae7Paul Duffin
am: bc54862ce5 Change-Id: Ia2f17389cbd3c278522c2fc021b961d492a348b7
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Paul Duffin
am: 8367d36ae7 Change-Id: Ic6f286637703eca3c526ee582ea25f892d16d596
2017-03-17Merge "Remove unneeded call to all-makefiles-under"Treehugger Robot
2017-03-17Remove unneeded call to all-makefiles-underPaul Duffin
It was only added to prevent conflicts with downstream and it is no longer needed downstream. Bug: 32912773 Test: make checkbuild Change-Id: I4fa9568b6ea7e745b0c8adffd0b1ab751ddf715e
2017-03-17Remove unused mockito-updated/ directoryPaul Duffin
Bug: 32912773 Test: make checkbuild Change-Id: I6712cd663957332c33ddc0ca6d669f4fffb0964d
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 55c52fc184 am: 9a76153826Paul Duffin
am: c091ec8258 Change-Id: I68025ddd72ddc70888f0a275cdf8ea504e85f13f
2017-03-17Modify the build and add necessary libraries am: ac292f9e96 am: 0bf44be962Paul Duffin
am: c891e46a5e Change-Id: I5339c39da80f84984c3f5e13e4914d4961546325
2017-03-17Upgrade to Mockito v2.7.13 am: 2637d96c20 am: 35f227d4afPaul Duffin
am: ddf4332e4d Change-Id: I8367c2cfef1be34e1f62418c63659990c50aa9a7
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13' am: 55c52fc184Paul Duffin
am: 9a76153826 Change-Id: I32c32b34cdbd26aaf651cefebaccc7b28be34740
2017-03-17Modify the build and add necessary libraries am: ac292f9e96Paul Duffin
am: 0bf44be962 Change-Id: I8b6ddad0f40b9258d9dc4fd79f5dd3724226cad9
2017-03-17Upgrade to Mockito v2.7.13 am: 2637d96c20Paul Duffin
am: 35f227d4af Change-Id: I566459c58992907a652db9a59e6af78e59fdc84d
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
am: 55c52fc184 Change-Id: I38008163a640ca2f1be8d6707d188b862ab898c7
2017-03-17Modify the build and add necessary librariesPaul Duffin
am: ac292f9e96 Change-Id: Ia9d46a9f3b402ab7f67555a8e1f32389fee147e9
2017-03-17Upgrade to Mockito v2.7.13Paul Duffin
am: 2637d96c20 Change-Id: Ia770da2cac068336b40ce1a6ab9ed53eb3913462
2017-03-17Merge changes from topic 'upgrade-mockito-2.7.13'Paul Duffin
* changes: Reimplement compatibility classes against 2.7.13 Modify the build and add necessary libraries Upgrade to Mockito v2.7.13
2017-03-16Merge "Break dependency between dexmaker-mockmaker-updated and dexmaker"TreeHugger Robot
2017-03-16Break dependency between dexmaker-mockmaker-updated and dexmakerPaul Duffin
Change Ic7d6254c942db0cac2d93e483532823e1ccc8bdf statically includes the dexmaker code in dexmaker-mockmaker-updated so the dexmaker library will no longer need to be separately included into mockito. Bug: 32912773 Test: make checkbuild Change-Id: If0d33a41ae191871367bd9c8a09c59a013f561b3
2017-03-15Merge "Update script to match upstream structure" am: 34c934f7dd am: 71deb5ab06Paul Duffin
am: f730d7767b Change-Id: I319a37788231d195424f9717feae76cad66efd36
2017-03-15Merge "Update script to match upstream structure" am: 34c934f7ddPaul Duffin
am: 71deb5ab06 Change-Id: If335ad417c89aefe20bc5a3f2ecd69274db9203b
2017-03-15Merge "Update script to match upstream structure"Paul Duffin
am: 34c934f7dd Change-Id: Ice51f32b7bf1111d9f039f4ba0f0b81b1e40da64
2017-03-15Reimplement compatibility classes against 2.7.13Paul Duffin
The matchers make describeTo(Description) final to detect any implementations that override that method without @Override. They need to be updated to override toString() instead. Bug: 32912773 Test: make checkbuild Change-Id: I51a387c8b2e51493f253749427648b4d154af338
2017-03-15Merge "Update script to match upstream structure"android-n-mr2-preview-2Paul Duffin
2017-03-15Modify the build and add necessary librariesPaul Duffin
Makes the build work. Bug: 32912773 Test: make checkbuild Change-Id: Iedcfa76188076db6aa4b5a62b7808241a74aa97d
2017-03-14Upgrade to Mockito v2.7.13Paul Duffin
Renames README.android to README.version to match most common use of the file name. Deletes the compat classes, they will be added later, along with an upstream patch. Bug: 32912773 Test: see following commit Change-Id: Iaa4d16b2a5a71955d7ecddf195ae681cf6505088
2017-03-14Update script to match upstream structurePaul Duffin
Also, updates the README.version file. Bug: 32912773 Test: ./update_source.sh v2.7.13 - see following commit Change-Id: Iaf64e33b6bdbf29bef2a1bb2c9652febc4979c37
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes" am: 4f00a506f3 am: ↵Paul Duffin
518f9aa8c1 am: cd4f6ae990 Change-Id: I8fe854f9e06b6952fd73181587f1f8fd936005bb
2017-03-10Merge "Make Android.mk match downstream version." am: 71befce14f am: cec867297aPaul Duffin
am: 22394a6503 -s ours Change-Id: I6f7f5ccd66ffa858aa2be55771b00d73556ee92e
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes" am: 4f00a506f3Paul Duffin
am: 518f9aa8c1 Change-Id: I46bba1520c53746d66f61863487e88f053f3c116
2017-03-10Merge "Make Android.mk match downstream version." am: 71befce14fPaul Duffin
am: cec867297a Change-Id: I99fc8939b40cc5fae8bb373753d67eb8fed79c43
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes"Paul Duffin
am: 4f00a506f3 Change-Id: I0d414acc762464786288d511e7c81919ecff7db1
2017-03-10Merge "Make Android.mk match downstream version."Paul Duffin
am: 71befce14f Change-Id: Ia2b8f5b387bb8314e37481240bef6bf678acc602
2017-03-10Merge "Improve Mockito 2.7.13 compatibility classes"Paul Duffin
2017-03-10Merge "Make Android.mk match downstream version."Paul Duffin
2017-03-10Make Android.mk match downstream version.Paul Duffin
This change is simply here to prevent following commits from conflicting when applied downstream. This will be reverted once upgrade to 2.7.13 has been completed. Bug: 32912773 Test: make checkbuild Merged-In: Ic19e6143a0df4733eb6da740b1e01f53253103e8 Change-Id: I01cb7d0cd7bf127a8978edf1e9bbac94cd267862
2017-03-10Improve Mockito 2.7.13 compatibility classesPaul Duffin
Adds describeTo(Description) method to call toString() method to get the description. 2.7.13 does not use that method at all because it is removing runtime dependencies on Hamcrest and so any implementations need to be modified to update their toString() method. Add default toString() implementation to match 1.10.19's default implementation of the describeTo(Description) method. Bug: 32912773 Test: make checkbuild Change-Id: I787fb62e931ea89899ede9db235ed156892d4b78
2017-03-09Merge changes I31dc4d3f,I884ba2cc am: 7ae8cdf00b am: 9c7e2baadbPaul Duffin
am: bd37897c73 Change-Id: I97880e9e5269bf1b4902548f3c66cd26cf90a7a0
2017-03-09Merge changes I31dc4d3f,I884ba2cc am: 7ae8cdf00bPaul Duffin
am: 9c7e2baadb Change-Id: Ife45679661b163ccb35b2de6e00023412fd77c7b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 20:18:53 +0000