summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Workaround for breaking change in OpenJDK 8 javadocHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Neil Fuller2016-03-311-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should only affect behavior when using the OpenJDK 8 version of javadoc. ConstructorDoc.name() is supposed to return the unqualified name for a constructor. It is left ambiguous as to what this means for constructors of inner classes. e.g. package foo; class Bar { static class Baz { public Baz() {} } } For OpenJDK 7, the method returns "Bar.Baz" as the name of the constructor. i.e. it is qualified with the name of the outer class, but not the package For OpenJDK 8, the method returns "Baz" as the name of the constructor. i.e. it is not qualified at all In Android this affects both what doclava is willing to accept in @link tags, but also the content of the API files like current.txt. This change retains the old behavior under both OpenJDK 7 and OpenJDK 8. If later Android wants to adopt the new semantics that can be done once OpenJDK 7 is no longer supported. Bug: 18051133 Change-Id: Ic753a8d308e5d773cca13bd44ba3463481881779
* Properly expose methods that override a non-hidden method in a hidden ↵C. Sean Young2015-09-181-1/+7
| | | | | | | | | | | superclass in the API files. Without this check, if a method overrides a non-hidden method in a hidden superclass, that method in the subclass would erronously be considered already "covered" by the hidden superclass, but the hidden superclass, and thus its methods, would not be shown in any of the API files. Change-Id: I416773be3aa3a8536684549011fa63b34f0d5251
* Add a flag to control the annotated field visibility exceptionOmari Stephens2015-08-172-3/+11
| | | | | | Bug: 8440225 Bug: 22723877 Change-Id: I4621b993cb958e7e5ca29b1a02530844f87abb68
* DO NOT MERGE Revert "D.N.M. Revert "Display annotations and annotation ↵Omari Stephens2015-08-143-3/+63
| | | | | | | | | | values when they are requested"" This reverts commit 846e46861b23124b3360bac9bdc3ec587aaf60a5. Bug: 22723877 Bug: 8440225 Change-Id: I2242e0373e8073f589f88bc0eecdb7a72e376bc7
* DO NOT MERGE Revert "Display annotations and annotation values when they are ↵Justin Morey2015-08-113-63/+3
| | | | | | | | | requested" This breaks the GmsCore build, by (among other things) including private fields in our API definitions, which probably isn't right. This reverts commit 274a19e4c4a6dc90d1a71b5f5c54438f343868a5.
* Display annotations and annotation values when they are requestedOmari Stephens2015-08-103-3/+63
| | | | | | | | | | | (cherry-picked from commit 6fa3e41df1664e59c13830b012b9be39c2b31cae) This exports the annotation field names and values, as well as displays them in the generated output whenever the annotation is chosen with the "-showAnnotation" argument to doclava Bug: 8440225 Change-Id: Iea71d3af2593e5067f4b1b1fbd3463539609f676
* am 30c1443e: am 54004373: Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-062-15/+13
|\ | | | | | | | | * commit '30c1443ea6993e42f6a8cc3d18fbc8d251655858': Fix handling of double-byte chars for tags, keywords.
| * am 54004373: Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-062-15/+13
| |\ | | | | | | | | | | | | * commit '5400437364666d0a7d3bfd6ea721fe15e813d657': Fix handling of double-byte chars for tags, keywords.
| | * Fix handling of double-byte chars for tags, keywords.Dirk Dougherty2015-07-022-15/+13
| | | | | | | | | | | | Change-Id: I03adc405d087eee5a8735f67525a79357ba6c3d5
* | | am 9647be42: am 0ec3764e: Fix a bug where \' (apostrophe/single quote) was ↵C. Sean Young2015-06-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | being escaped with &pos instead of the correct &apos. * commit '9647be429b6b4564dc7b38aca526791a72a1866d': Fix a bug where ' (apostrophe/single quote) was being escaped with &pos instead of the correct &apos.
| * | am 0ec3764e: Fix a bug where \' (apostrophe/single quote) was being escaped ↵C. Sean Young2015-06-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | with &pos instead of the correct &apos. * commit '0ec3764e8e76ff8fef5c3d8a6754cd5e760c3fba': Fix a bug where ' (apostrophe/single quote) was being escaped with &pos instead of the correct &apos.
| | * | Fix a bug where ' (apostrophe/single quote) was being escaped with &pos ↵C. Sean Young2015-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | instead of the correct &apos. Change-Id: I6f0b5b7e7beed2ca7878460d99619f0a016ebed1
* | | | am 7effdf51: am f8e1e391: Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-151-2/+3
|\| | | | | | | | | | | | | | | | | | | * commit '7effdf51d490640596eb23e55b3a4b19428da5ba': Minor performance tweak in Doclava#makePackageHDF()
| * | | am f8e1e391: Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-121-2/+3
| |\| | | | | | | | | | | | | | | | | | * commit 'f8e1e3910a9509eecb7eea99cf2d1c6a75699271': Minor performance tweak in Doclava#makePackageHDF()
| | * | Minor performance tweak in Doclava#makePackageHDF()C. Sean Young2015-06-121-2/+3
| | | | | | | | | | | | | | | | Change-Id: I0f9f4eada3f3b640e490d8f0221cbe7af148b06c
* | | | Merge "Fix NPE on checkapi with malformed text input" into mnc-devJames Cook2015-06-121-15/+10
|\ \ \ \
| * | | | Fix NPE on checkapi with malformed text inputJames Cook2015-06-081-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApiCheck.checkApi() was returning null on malformed text API files, but the calling code expects a ApiParseException. Bug: 21698572 Change-Id: I625cc5ddcee5fd287709ff3ffbed9c1dd339abed
* | | | | resolved conflicts for merge of b4dd76b8 to mnc-devC. Sean Young2015-06-121-2/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Change-Id: I2525c9113664db9c9d3a750347058973e6f74972
| * | | am 4a42aefb: Update JDK tools jar lookup logic to use BuildUtils.C. Sean Young2015-06-121-12/+3
| |\| | | | | | | | | | | | | | | | | | * commit '4a42aefbf4332c0c656465cb623958657e799939': Update JDK tools jar lookup logic to use BuildUtils.
| | * | Update JDK tools jar lookup logic to use BuildUtils.C. Sean Young2015-06-101-12/+3
| | | | | | | | | | | | | | | | Change-Id: I18bbf607b18b41a69bcd33c08a83c35dbc510ca5
* | | | Fix broken handling of @removed tagSvetoslav2015-06-051-1/+2
| | | | | | | | | | | | | | | | Change-Id: I735dcc97ea6c0a5ee14cd8e94a1776197876881a
* | | | am 96c56a80: am 024e9b26: Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '96c56a80033ef40cf0a615d4a6ddf8e3c269d158': Add distribute/tools content to essentials content.
| * | | am 024e9b26: Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '024e9b26352d0ef6d01b34d6f86992eb2964bfc8': Add distribute/tools content to essentials content.
| | * | Add distribute/tools content to essentials content.Dirk Dougherty2015-05-261-1/+1
| | | | | | | | | | | | | | | | Change-Id: I99ff44e2d609214d734cf7b07c24e0b20b90c759
* | | | am b9ced2dd: am 4d6512a4: Docs: Enables NDK Downloads page to use sdkpage.cs ↵David Friedman2015-05-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | to construct download table. * commit 'b9ced2dd9d751c5b852e6bed3b2ae42ecadd2e0e': Docs: Enables NDK Downloads page to use sdkpage.cs to construct download table.
| * | | am 4d6512a4: Docs: Enables NDK Downloads page to use sdkpage.cs to construct ↵David Friedman2015-05-241-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | download table. * commit '4d6512a4590e4318c37b039f2c56753f6adfbb2b': Docs: Enables NDK Downloads page to use sdkpage.cs to construct download table.
| | * | Docs: Enables NDK Downloads page to use sdkpage.cs to construct downloadDavid Friedman2015-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | table. Change-Id: I664e0c77e4dbf87a87a827767500aea435065171
* | | | resolved conflicts for merge of c10f7ae0 to mnc-devC. Sean Young2015-05-203-5/+79
|\| | | | | | | | | | | | | | | Change-Id: I33ed09c2b635fbe83694bc1ad03e027419aa007e
| * | | am dc0b6e0d: Merge "Add the ability to specify packages or classes to ignore ↵C. Sean Young2015-05-203-6/+62
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | for ApiCheck." into lmp-mr1-app-dev * commit 'dc0b6e0df8c93f408d44823dc4151e8ec8359407': Add the ability to specify packages or classes to ignore for ApiCheck.
| | * | Merge "Add the ability to specify packages or classes to ignore for ↵C. Sean Young2015-05-203-6/+62
| | |\ \ | | | | | | | | | | | | | | | ApiCheck." into lmp-mr1-app-dev
| | | * | Add the ability to specify packages or classes to ignore for ApiCheck.C. Sean Young2015-05-203-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, these are matched exactly by qualified name; subpackages are not recognized. Change-Id: I69f970cbb059be1a9705f5b36991dcdd2d210408
* | | | | resolved conflicts for merge of 552b5f66 to mnc-devC. Sean Young2015-05-203-27/+38
|\| | | | | | | | | | | | | | | | | | | Change-Id: I1dfe65d9cccf3d0aae7800215cf8f5e66a0d7347
| * | | | am 6904e036: Merge "Make CheckApi error messages more consisent and ↵C. Sean Young2015-05-203-27/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | informative." into lmp-mr1-app-dev * commit '6904e0369dbf0d4875368cc29cea3cdc7d993cba': Make CheckApi error messages more consisent and informative.
| | * | | Merge "Make CheckApi error messages more consisent and informative." into ↵C. Sean Young2015-05-203-27/+38
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-app-dev
| | | * | | Make CheckApi error messages more consisent and informative.C. Sean Young2015-05-143-27/+38
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CheckApi error messages involving methods print out signature rather than just qualified name. Previously, only constructor related additions and removals did this. This made it difficult to tell which overload of a method had an API change. Updates constructor related messages to use the fully qualified name of the class. Also makes deprecation status change messages consistent (fields and classes now show before and after, in addition to methods). Change-Id: I83f06e96bf20e234fcc432ebec8d0b8ae04a22d2
* | | | | am 6375c329: am da4b2e21: Save memory by re-using empty TagInfo (and ↵C. Sean Young2015-05-2013-28/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subclasses) arrays. * commit '6375c32993ca44863669cce02d9c05c95c9fec4f': Save memory by re-using empty TagInfo (and subclasses) arrays.
| * | | | am da4b2e21: Save memory by re-using empty TagInfo (and subclasses) arrays.C. Sean Young2015-05-2013-28/+101
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'da4b2e21af0d8efcfe73ff060839c97a2d4b8b03': Save memory by re-using empty TagInfo (and subclasses) arrays.
| | * | | Save memory by re-using empty TagInfo (and subclasses) arrays.C. Sean Young2015-05-2013-28/+101
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arrays of TagInfo (and subclasses) often tend to be empty, as many members simply won't have any of the relevant tags. Re-using empty arrays saves potentially a dozen or more megabytes for large projects. Also some minor performance tweaks the Javadoc comment parsing. Change-Id: Iffaddd3b59a4f8183f11efd6e2680aad95633ade
* | | | Merge "add new option to ApiCheck to look for new API methods" into mnc-devGuang Zhu2015-05-144-3/+167
|\ \ \ \
| * | | | add new option to ApiCheck to look for new API methodsGuang Zhu2015-04-274-3/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 'newapi' option is needed, ApiCheck will be in "diff" mode: * when classes are checked for consistency, newly added methods and constructors are kept in lists * when packages are checked for consistency, newly added classes and classes with new API methods are kept in list * when APIs are checked for consistency, newly added packages and pakages with new/modified classes are added * the accumulated deltas are then exported in XML format Change-Id: I3fed989e2836109e334c0e665639190196f14f4c
* | | | | am a97e1bf7: am e8cdc5b7: Set page.type to preview for preview pages.Dirk Dougherty2015-05-071-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'a97e1bf7086d18ea18d69b75c8109dea9cb6d4ac': Set page.type to preview for preview pages.
| * | | | am e8cdc5b7: Set page.type to preview for preview pages.Dirk Dougherty2015-05-071-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'e8cdc5b766826a717481b20dea1083168e5275cd': Set page.type to preview for preview pages.
| | * | | Set page.type to preview for preview pages.Dirk Dougherty2015-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icf1def67f1b282a9a9a932fa13941f9694d17ada
* | | | | am 34cf9d6e: (-s ours) Add wildcard support to stubpackages DO NOT MERGEChris Banes2015-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '34cf9d6e3a6448578438e925384114177de3978a': Add wildcard support to stubpackages DO NOT MERGE
| * | | | Add wildcard support to stubpackages DO NOT MERGEChris Banes2015-05-041-1/+44
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows things like -stubpackages my.package.* which is really useful for the support lib API file generation. The alternative is keeping a list of each library's package, which is brittle to future changes. Change-Id: Ibd49cc0348e2767b2c0fe6f14e7253b6d8e04c7b (cherry picked from commit 372e36e9014ff0d0ff478bd63c374c0068564be1)
* | / / Add wildcard support to stubpackagesChris Banes2015-05-011-1/+44
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Allows things like -stubpackages my.package.* which is really useful for the support lib API file generation. The alternative is keeping a list of each library's package, which is brittle to future changes. Change-Id: Ibd49cc0348e2767b2c0fe6f14e7253b6d8e04c7b
* | | am b948ffff: am 793d5096: am d1ccc1c9: am 26333cad: add hdf variables for ↵smain@google.com2015-04-141-1/+5
|\| | | | | | | | | | | | | | | | | | | | ndk tab docs * commit 'b948ffffae412a12d92b17f1e70d9fee529c0804': add hdf variables for ndk tab docs
| * | am 793d5096: am d1ccc1c9: am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-141-1/+5
| |\ \ | | | | | | | | | | | | | | | | * commit '793d50965f70e94cbbfc8a38905888d554934bf7': add hdf variables for ndk tab docs
| | * | am d1ccc1c9: am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-141-1/+5
| | |\| | | | | | | | | | | | | | | | | * commit 'd1ccc1c9cfc5d1e7f400fa5bba4c773af56acb0c': add hdf variables for ndk tab docs
| | | * am 26333cad: add hdf variables for ndk tab docssmain@google.com2015-04-131-1/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '26333cad83ce2bd5d793c82f8af30b46dfe933a9': add hdf variables for ndk tab docs