aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-10Fix merging add/remove on same method.android-wear-n-preview-2android-wear-7.1.1_r1android-n-mr2-preview-2android-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-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseJoachim Sauer
am: 8f27032b2a * commit '8f27032b2aaf133892562f83314efa39a9c2353c': Fix merging add/remove on same method. Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1
2016-05-10Fix merging add/remove on same method.android-n-preview-5android-n-preview-4android-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-4android-n-iot-preview-2android-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-iot-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-mr2-preview-1n-mr1-preview-1n-iot-preview-4n-iot-preview-2Joachim Sauer
Changes to methods are detected as both addition/removal and merged into a single "change" entry in a separate step. The code that searched for the equivalent "remove" step only ever looked at the first removed method with that name, ch caused the merging to change if several methods with the same name were changed at once (for example several overloads were precated at once). Bug: 27582395 Change-Id: I9718709de4d5e70c291c92ca2801e922f98a39a1
2015-08-27am 97a22150: am e99056f3: (-s ours) am 16f46fdf: Adjust jdiff to be able to ↵android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1n-preview-2n-preview-1C. Sean Young
read both Doclava and "regular" Jdiff API xml files. * commit '97a22150ae54eb113a25bc3651bed30c9e76b307':
2015-08-27am 29394eb7: am 6a9c978c: (-s ours) am e5f2cfb4: Merge "Remove ambiguity ↵Neil Fuller
around Parameter class on OpenJDK 8" * commit '29394eb7f99625bf99b26df2f4b2eec8d9f95170':
2015-08-27am e99056f3: (-s ours) am 16f46fdf: Adjust jdiff to be able to read both ↵C. Sean Young
Doclava and "regular" Jdiff API xml files. * commit 'e99056f372372400344a9a33f07c4337c0d5da92':
2015-08-27am 6a9c978c: (-s ours) am e5f2cfb4: Merge "Remove ambiguity around Parameter ↵Neil Fuller
class on OpenJDK 8" * commit '6a9c978c8918540919daa392712f480e5552e252':
2015-08-13am 4e4f52c3: am 16f46fdf: Adjust jdiff to be able to read both Doclava and ↵C. Sean Young
"regular" Jdiff API xml files. * commit '4e4f52c3df03d1451def023694abb9e17a6483fa': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-13am 16f46fdf: Adjust jdiff to be able to read both Doclava and "regular" ↵C. Sean Young
Jdiff API xml files. * commit '16f46fdf56b5a04e19689969aeaffb58efeb5d92': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-13am 16f46fdf: Adjust jdiff to be able to read both Doclava and "regular" ↵C. Sean Young
Jdiff API xml files. * commit '16f46fdf56b5a04e19689969aeaffb58efeb5d92': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-08-12Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.C. Sean Young
Bug: 19914336 Change-Id: I3b27c178840ac31da67c99270b47bce4dae308db
2015-08-12am ac9a6960: am e5f2cfb4: Merge "Remove ambiguity around Parameter class on ↵Neil Fuller
OpenJDK 8" * commit 'ac9a6960113d79027cb45ba30f46608b71851430': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12am e5f2cfb4: Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
* commit 'e5f2cfb43e14d4e32f145102ae398003e0ed5927': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12am e5f2cfb4: Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
* commit 'e5f2cfb43e14d4e32f145102ae398003e0ed5927': Remove ambiguity around Parameter class on OpenJDK 8
2015-08-12Merge "Remove ambiguity around Parameter class on OpenJDK 8"Neil Fuller
2015-08-12Remove ambiguity around Parameter class on OpenJDK 8Neil Fuller
The use of .* imports means that the introduction of the java.lang.reflect.Parameter to the java APIs is ambiguous (vs com.sun.javadoc.Parameter). Bug: 23133454 Change-Id: I600ff3ab9d61ca0dd064c3b23600fed548e07234
2015-07-30Merge "package version metadata for external/"Bill Napier
2015-06-19am 0860aaa8: Adjust jdiff to be able to read both Doclava and "regular" ↵C. Sean Young
Jdiff API xml files. * commit '0860aaa8b3cd01b42407009ffe4e0697ef0c1356': Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.
2015-06-18Adjust jdiff to be able to read both Doclava and "regular" Jdiff API xml files.android-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_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_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-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_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_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-devmarshmallow-devC. Sean Young
Bug: 19914336 Change-Id: I3b27c178840ac31da67c99270b47bce4dae308db
2015-06-17am d370cc3f: Fix an additional use of an external parsing library.C. Sean Young
* commit 'd370cc3f5f6feeeb76c2c4e288f960a7fc83112a': Fix an additional use of an external parsing library.
2015-06-16Fix an additional use of an external parsing library.C. Sean Young
This one was missed in the initial removal. See Ia5f8acbbeff54af51986512505933e83f7919d73 Change-Id: I1f189f0f2c424911199469da07a8359e24b47c08
2015-06-12am 8fffa0b4: Add build.gradleC. Sean Young
* commit '8fffa0b462fe681b9367e5d5cc3ec33bc47245a5': Add build.gradle
2015-06-12am a8986b15: Removing the use of an external xml parsing lib.Paul Rashidi
* commit 'a8986b15aa89da6bfe502821a29fd3ef4595d7d5': Removing the use of an external xml parsing lib.
2015-06-10Add build.gradleC. Sean Young
Change-Id: Id10bda5db7f7b6c0d205aaa0ed09dbe095b790f4
2015-06-10Removing the use of an external xml parsing lib.Paul Rashidi
API JDiffs for Google Play services ran across a bug with the xerces.jar so switching to the native library to resolve. Change-Id: Ia5f8acbbeff54af51986512505933e83f7919d73 (cherry picked from commit 2f5f31a8f36d12a0cbf4520f213ef325c18d40b3)
2015-06-04Removing the use of an external xml parsing lib.Paul Rashidi
API JDiffs for Google Play services ran across a bug with the xerces.jar so switching to the native library to resolve. Change-Id: Ia5f8acbbeff54af51986512505933e83f7919d73
2015-06-02package version metadata for external/Damien Miller
This will be used for automated notification of external vulnerability reports. Change-Id: Ia4cc424c9c0e4b1acbb2a00c4b6d57b0598d06e8
2011-02-01Remove files that we do not use during compilation.android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-sdk-support_r11android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-m-previewandroid-l-preview_r2android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-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-cts-4.4_r4android-cts-4.4_r1android-cts-4.2_r2android-cts-4.2_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-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_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_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-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_r1android-4.1_pre2android-4.1_pre1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.1-sdk_pre1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.4-aah_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r22.2tools_r22tools_r21tools_r20master-soonglollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-releasejb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-factory-releasejb-mr1-dev-plus-aospjb-mr1-devjb-mr0-releasejb-devidea133-weekly-releaseidea133ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseics-aah-releaseAnatol Pomazau
This makes build script simpler. Also it will be easier to convert the buildfile to other build tools (such as Tup). Change-Id: I2d83d2d0c638bec50411e07d693cff3049f67903
2010-10-19Add missing NOTICE files.David Deephanphongs
Rename NOTICE.txt file to NOTICE, so that it will be picked up by the build system. Change-Id: I747bb71d59583f6fcca795ee151d330491642ce1
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7gingerbread-releasegingerbread-mr4-releasegingerbreadfroyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: Ib5d25eccbaacf1db30728d8eea72e42e98961ad6
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-04-22Merge donut into masterandroid-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releasedonut-plus-aospJean-Baptiste Queru
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru
2009-03-03auto import from //depot/cupcake/@135843android-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1android-1.5r4android-1.5r3android-1.5r2android-1.5donut-release2donut-releasedonutcupcake-releasecupcakeThe Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial Contributionandroid-1.0release-1.0nougat-mr1-arccdma-importThe Android Open Source Project
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:48:04 +0000